diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-17 15:08:09 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-17 15:08:09 +0000 |
| commit | ac9e1472891fe9d69e1660985841f2f8fbb797f8 (patch) | |
| tree | dfc38fdce7e2373dbd91b432320fedd8f1fb5bd9 /phpBB/viewforum.php | |
| parent | b1597679c232135ada4abbbf6282a5f3d7d1e19a (diff) | |
| download | forums-ac9e1472891fe9d69e1660985841f2f8fbb797f8.tar forums-ac9e1472891fe9d69e1660985841f2f8fbb797f8.tar.gz forums-ac9e1472891fe9d69e1660985841f2f8fbb797f8.tar.bz2 forums-ac9e1472891fe9d69e1660985841f2f8fbb797f8.tar.xz forums-ac9e1472891fe9d69e1660985841f2f8fbb797f8.zip | |
Apply append_sid() to newest/latest post links in viewforum/search and UCP main module. (Bug #26815)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9459 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 14564ad38c..507ea18d24 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -612,7 +612,8 @@ if (sizeof($topic_list)) topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type); // Generate all the URIs ... - $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . '&t=' . $topic_id); + $view_topic_url_params = 'f=' . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . '&t=' . $topic_id; + $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params); $topic_unapproved = (!$row['topic_approved'] && $auth->acl_get('m_approve', $forum_id)) ? true : false; $posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $forum_id)) ? true : false; @@ -664,8 +665,8 @@ if (sizeof($topic_list)) 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false, 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false, - 'U_NEWEST_POST' => $view_topic_url . '&view=unread#unread', - 'U_LAST_POST' => $view_topic_url . '&p=' . $row['topic_last_post_id'] . '#p' . $row['topic_last_post_id'], + 'U_NEWEST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&view=unread') . '#unread', + 'U_LAST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'], 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), 'U_TOPIC_AUTHOR' => get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'U_VIEW_TOPIC' => $view_topic_url, |