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/includes/ucp/ucp_main.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/includes/ucp/ucp_main.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 0c28fbecf1..5b6bdd445d 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -670,10 +670,10 @@ class ucp_main if ($topics_count) { - phpbb_generate_template_pagination($this->u_action, 'pagination', $topics_count, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($template, $this->u_action, 'pagination', $topics_count, $config['topics_per_page'], $start); $template->assign_vars(array( - 'PAGE_NUMBER' => on_page($this->u_action, $topics_count, $config['topics_per_page'], $start), + 'PAGE_NUMBER' => phpbb_on_page($template, $user, $this->u_action, $topics_count, $config['topics_per_page'], $start), 'TOTAL_TOPICS' => $user->lang('VIEW_FORUM_TOPICS', (int) $topics_count), )); } @@ -838,7 +838,7 @@ class ucp_main 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), )); - phpbb_generate_template_pagination(append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . "&t=$topic_id"), 'topicrow.pagination', $replies + 1, $config['posts_per_page'], 1, true, true); + phpbb_generate_template_pagination($template, append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . "&t=$topic_id"), 'topicrow.pagination', $replies + 1, $config['posts_per_page'], 1, true, true); } } } |