diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-29 14:48:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-29 14:48:23 +0000 |
| commit | a94222ee5a86afd828acac93e3c4722416daf802 (patch) | |
| tree | 1bb4c4ff7a7dc846370311e51e0f05360415eb05 /phpBB/viewtopic.php | |
| parent | b011b84060759f83c323c1f4bbfee75c7028d7d7 (diff) | |
| download | forums-a94222ee5a86afd828acac93e3c4722416daf802.tar forums-a94222ee5a86afd828acac93e3c4722416daf802.tar.gz forums-a94222ee5a86afd828acac93e3c4722416daf802.tar.bz2 forums-a94222ee5a86afd828acac93e3c4722416daf802.tar.xz forums-a94222ee5a86afd828acac93e3c4722416daf802.zip | |
fix bug #1549
git-svn-id: file:///svn/phpbb/trunk@5861 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 1351948d28..535f12ee0e 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -794,7 +794,7 @@ while ($row = $db->sql_fetchrow($result)) $poster_id = $row['poster_id']; $poster = ($poster_id == ANONYMOUS) ? ((!empty($row['post_username'])) ? $row['post_username'] : $user->lang['GUEST']) : $row['username']; - if (!$view || $view != 'show' || $post_id != $row['post_id']) + if ($view != 'show' || $post_id != $row['post_id']) { if ($row['foe']) { @@ -1124,7 +1124,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) { $template->assign_block_vars('postrow', array( 'S_IGNORE_POST' => true, - 'L_IGNORE_POST' => sprintf($user->lang['POST_BY_FOE'], $row['poster'], "<a href=\"viewtopic.$phpEx$SID&f=$forum_id&p=" . $row['post_id'] . '&view=show#p' . $row['post_id'] . '">', '</a>')) + 'L_IGNORE_POST' => sprintf($user->lang['POST_BY_FOE'], $row['poster'], '<a href="' . $viewtopic_url . '&p=' . $row['post_id'] . '&view=show#p' . $row['post_id'] . '">', '</a>')) ); continue; @@ -1139,7 +1139,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) { $template->assign_block_vars('postrow', array( 'S_IGNORE_POST' => true, - 'L_IGNORE_POST' => sprintf($user->lang['POST_ENCODING'], $row['poster'], '<a href="viewtopic.' . $phpEx . $SID . '&p=' . $row['post_id'] . '&view=encoding#p' . $row['post_id'] . '">', '</a>')) + 'L_IGNORE_POST' => sprintf($user->lang['POST_ENCODING'], $row['poster'], '<a href="' . $viewtopic_url . '&p=' . $row['post_id'] . '&view=encoding#p' . $row['post_id'] . '">', '</a>')) ); continue; @@ -1312,7 +1312,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'U_MCP_REPORT' => ($auth->acl_gets('m_report', $forum_id)) ? "{$phpbb_root_path}mcp.$phpEx$SID&i=reports&mode=report_details&p=" . $row['post_id'] : '', 'U_MCP_APPROVE' => ($auth->acl_get('m_approve', $forum_id)) ? "{$phpbb_root_path}mcp.$phpEx$SID&i=queue&mode=unapproved_posts&action=approve&post_id_list[]=" . $row['post_id'] : '', 'U_MINI_POST' => "{$phpbb_root_path}viewtopic.$phpEx$SID&p=" . $row['post_id'] . '#p' . $row['post_id'], - 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$i + 1])) ? $rowset[$i + 1]['post_id'] : '', + 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_gets('m_', 'a_')) ? "{$phpbb_root_path}mcp.$phpEx$SID&i=notes&mode=user_notes&u=" . $poster_id : '', 'U_WARN' => ($auth->acl_gets('m_', 'a_', $forum_id)) ? "{$phpbb_root_path}mcp.$phpEx$SID&i=warn&mode=warn_post&p=" . $row['post_id'] : '', @@ -1358,7 +1358,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) $prev_post_id = $row['post_id']; - unset($rowset[$i]); + unset($rowset[$post_list[$i]]); unset($attachments[$row['post_id']]); } unset($rowset); |