aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorDrae <paul@starstreak.net>2012-07-08 21:07:28 +0100
committerDrae <paul@starstreak.net>2012-07-18 14:32:18 +0100
commit27d8aef528460e87efc90bc4fffc82c0d1fa87d9 (patch)
tree91628c158d80d76bac305a9933ec8b74b5336b96 /phpBB/includes/acp/acp_users.php
parentcf4d6e926dd83d61073ac355cdaf7778a18dcbf8 (diff)
downloadforums-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/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index d73fa46fdc..869bb9cd72 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1121,11 +1121,11 @@ class acp_users
$start = view_log('user', $log_data, $log_count, $config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort);
$base_url = $this->u_action . "&amp;u=$user_id&amp;$u_sort_param";
- phpbb_generate_template_pagination($base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
+ phpbb_generate_template_pagination($template, $base_url, 'pagination', $log_count, $config['topics_per_page'], $start);
$template->assign_vars(array(
'S_FEEDBACK' => true,
- 'S_ON_PAGE' => on_page($base_url, $log_count, $config['topics_per_page'], $start),
+ 'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $log_count, $config['topics_per_page'], $start),
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
@@ -2038,11 +2038,11 @@ class acp_users
$db->sql_freeresult($result);
$base_url = $this->u_action . "&amp;u=$user_id&amp;sk=$sort_key&amp;sd=$sort_dir";
- phpbb_generate_template_pagination($base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start);
+ phpbb_generate_template_pagination($template, $base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start);
$template->assign_vars(array(
'S_ATTACHMENTS' => true,
- 'S_ON_PAGE' => on_page($base_url, $num_attachments, $config['topics_per_page'], $start),
+ 'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $num_attachments, $config['topics_per_page'], $start),
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
));