diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-09 21:41:19 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-09 21:41:19 +0100 |
| commit | 58d8ea5b0b0810f2f84cbbf89aebb874010b5378 (patch) | |
| tree | 3bca8a3838dfe029ee3d9cb72c34a330979e0f27 /phpBB/viewforum.php | |
| parent | d9bdd05c8065eecc99c55b827a8af575fcb08f1b (diff) | |
| parent | de3d7aca169cce5b2017c15bc77d877aa272aabf (diff) | |
| download | forums-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/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 97a979ed13..92ac9171cb 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -370,7 +370,7 @@ $template->assign_vars(array( 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&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&f=' . $forum_id) : '', 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($start == 0) ? '' : "&start=$start")), - 'U_CANONICAL' => generate_board_url() . '/' . append_sid("viewforum.$phpEx", "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($start) ? "&start=$start" : ''), true, ''), + 'U_CANONICAL' => generate_board_url() . '/' . append_sid("viewforum.$phpEx", "f=$forum_id" . (($start) ? "&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') . "&f=$forum_id&mark=topics&mark_time=" . time()) : '', )); |