diff options
| author | Drae <paul@starstreak.net> | 2012-07-08 21:07:28 +0100 |
|---|---|---|
| committer | Drae <paul@starstreak.net> | 2012-07-18 14:32:18 +0100 |
| commit | 27d8aef528460e87efc90bc4fffc82c0d1fa87d9 (patch) | |
| tree | 91628c158d80d76bac305a9933ec8b74b5336b96 /phpBB/viewtopic.php | |
| parent | cf4d6e926dd83d61073ac355cdaf7778a18dcbf8 (diff) | |
| download | forums-27d8aef528460e87efc90bc4fffc82c0d1fa87d9.tar forums-27d8aef528460e87efc90bc4fffc82c0d1fa87d9.tar.gz forums-27d8aef528460e87efc90bc4fffc82c0d1fa87d9.tar.bz2 forums-27d8aef528460e87efc90bc4fffc82c0d1fa87d9.tar.xz forums-27d8aef528460e87efc90bc4fffc82c0d1fa87d9.zip | |
[feature/pagination-as-list] Updates for nils comments
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.
PHPBB3-10968
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 2e197932af..51c92df1af 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -584,7 +584,7 @@ if (!empty($_EXTRA_URL)) // If we've got a hightlight set pass it on to pagination. $base_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . (($highlight_match) ? "&hilit=$highlight" : '')); -phpbb_generate_template_pagination($base_url, 'pagination', $total_posts, $config['posts_per_page'], $start); +phpbb_generate_template_pagination($template, $base_url, 'pagination', $total_posts, $config['posts_per_page'], $start); // Send vars to template $template->assign_vars(array( @@ -599,7 +599,7 @@ $template->assign_vars(array( 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']), 'TOPIC_AUTHOR' => get_username_string('username', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']), - 'PAGE_NUMBER' => on_page($base_url, $total_posts, $config['posts_per_page'], $start), + 'PAGE_NUMBER' => phpbb_on_page($template, $user, $base_url, $total_posts, $config['posts_per_page'], $start), 'TOTAL_POSTS' => $user->lang('VIEW_TOPIC_POSTS', (int) $total_posts), 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=topic_view&f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start") . ((strlen($u_sort_param)) ? "&$u_sort_param" : ''), true, $user->session_id) : '', 'MODERATORS' => (isset($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : '', |