aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/search.php
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/search.php
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/search.php')
-rw-r--r--phpBB/search.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/search.php b/phpBB/search.php
index 2defd4bb92..7c21b8dd01 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -767,7 +767,8 @@ if ($keywords || $author || $author_id || $search_id || $submit)
$u_forum_id = $forum_id;
}
- $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$u_forum_id&amp;t=$result_topic_id" . (($u_hilit) ? "&amp;hilit=$u_hilit" : ''));
+ $view_topic_url_params = "f=$u_forum_id&amp;t=$result_topic_id" . (($u_hilit) ? "&amp;hilit=$u_hilit" : '');
+ $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params);
$replies = ($auth->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies'];
@@ -825,10 +826,10 @@ if ($keywords || $author || $author_id || $search_id || $submit)
'S_TOPIC_UNAPPROVED' => $topic_unapproved,
'S_POSTS_UNAPPROVED' => $posts_unapproved,
- 'U_LAST_POST' => $view_topic_url . '&amp;p=' . $row['topic_last_post_id'] . '#p' . $row['topic_last_post_id'],
+ '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_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_NEWEST_POST' => $view_topic_url . '&amp;view=unread#unread',
+ 'U_NEWEST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&amp;view=unread') . '#unread',
'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&amp;mode=reports&amp;t=' . $result_topic_id, true, $user->session_id),
'U_MCP_QUEUE' => $u_mcp_queue,
);