aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-04-17 15:08:09 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-04-17 15:08:09 +0000
commitac9e1472891fe9d69e1660985841f2f8fbb797f8 (patch)
treedfc38fdce7e2373dbd91b432320fedd8f1fb5bd9 /phpBB/includes/ucp
parentb1597679c232135ada4abbbf6282a5f3d7d1e19a (diff)
downloadforums-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/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_main.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index f3bc81652f..6ac2412ef0 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -779,7 +779,8 @@ class ucp_main
$folder_img = $folder_alt = $topic_type = '';
topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type);
- $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id");
+ $view_topic_url_params = "f=$forum_id&amp;t=$topic_id";
+ $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params);
// Send vars to template
$template->assign_block_vars('topicrow', array(
@@ -822,8 +823,8 @@ class ucp_main
'S_USER_POSTED' => (!empty($row['topic_posted'])) ? true : false,
'S_UNREAD_TOPIC' => $unread_topic,
- 'U_NEWEST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id&amp;view=unread") . '#unread',
- 'U_LAST_POST' => $view_topic_url . '&amp;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 . '&amp;view=unread') . '#unread',
+ 'U_LAST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&amp;p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
'U_VIEW_TOPIC' => $view_topic_url,
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id),
));