aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-01-09 21:41:19 +0100
committerJoas Schilling <nickvergessen@gmx.de>2015-01-09 21:41:19 +0100
commit58d8ea5b0b0810f2f84cbbf89aebb874010b5378 (patch)
tree3bca8a3838dfe029ee3d9cb72c34a330979e0f27 /phpBB/viewtopic.php
parentd9bdd05c8065eecc99c55b827a8af575fcb08f1b (diff)
parentde3d7aca169cce5b2017c15bc77d877aa272aabf (diff)
downloadforums-58d8ea5b0b0810f2f84cbbf89aebb874010b5378.tar
forums-58d8ea5b0b0810f2f84cbbf89aebb874010b5378.tar.gz
forums-58d8ea5b0b0810f2f84cbbf89aebb874010b5378.tar.bz2
forums-58d8ea5b0b0810f2f84cbbf89aebb874010b5378.tar.xz
forums-58d8ea5b0b0810f2f84cbbf89aebb874010b5378.zip
Merge pull request #3265 from tas2580/develop-ascraeus
[ticket/13453] Sort param in Canonical URL
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index a44169d3f1..5f897e8d94 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -692,7 +692,7 @@ $template->assign_vars(array(
'U_TOPIC' => "{$server_path}viewtopic.$phpEx?f=$forum_id&amp;t=$topic_id",
'U_FORUM' => $server_path,
'U_VIEW_TOPIC' => $viewtopic_url,
- 'U_CANONICAL' => generate_board_url() . '/' . append_sid("viewtopic.$phpEx", "t=$topic_id" . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : '') . (($start) ? "&amp;start=$start" : ''), true, ''),
+ 'U_CANONICAL' => generate_board_url() . '/' . append_sid("viewtopic.$phpEx", "t=$topic_id" . (($start) ? "&amp;start=$start" : ''), true, ''),
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id),
'U_VIEW_OLDER_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id&amp;view=previous"),
'U_VIEW_NEWER_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id&amp;view=next"),