aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-16 11:34:04 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-16 11:34:04 +0200
commit08b5d052c6284514208b6af2e3b286c4c1f86f26 (patch)
tree10460fcdf76966a418b3e5d6449c1d93679dd319 /phpBB/viewforum.php
parent199854af1bd0d52f7d3e720d6dc6aa0de5cd4a5a (diff)
downloadforums-08b5d052c6284514208b6af2e3b286c4c1f86f26.tar
forums-08b5d052c6284514208b6af2e3b286c4c1f86f26.tar.gz
forums-08b5d052c6284514208b6af2e3b286c4c1f86f26.tar.bz2
forums-08b5d052c6284514208b6af2e3b286c4c1f86f26.tar.xz
forums-08b5d052c6284514208b6af2e3b286c4c1f86f26.zip
[ticket/12555] Add canonical URL for viewforum
Avoids duplicate content of: * viewforum.php?f=forum_id * viewforum.php?f=forum_id&start=0 PHPBB3-12555
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index f1b0b4df5b..6c7e56cffd 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -366,6 +366,7 @@ $template->assign_vars(array(
'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&amp;i=main&amp;mode=forum_view", true, $user->session_id) : '',
'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&amp;f=' . $forum_id) : '',
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : '') . (($start == 0) ? '' : "&amp;start=$start")),
+ 'U_CANONICAL' => generate_board_url() . '/' . append_sid("viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&amp;$u_sort_param" : '') . (($start) ? "&amp;start=$start" : ''), true, ''),
'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . "&amp;f=$forum_id&amp;mark=topics&amp;mark_time=" . time()) : '',
));