diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-12-25 00:54:07 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-12-25 00:54:07 +0530 |
| commit | f9c7f0fc193802fb866063c88e2d3448b6f0d010 (patch) | |
| tree | 15bd28e240dbb6a2749a7bb9b06de130b18e0735 /phpBB/includes/acp/acp_inactive.php | |
| parent | 02336d9a69eaab23ec03be2d9535ec9576dadf5a (diff) | |
| parent | cb8b2bab5f72023ad2de95bcb59f90e7121e6369 (diff) | |
| download | forums-f9c7f0fc193802fb866063c88e2d3448b6f0d010.tar forums-f9c7f0fc193802fb866063c88e2d3448b6f0d010.tar.gz forums-f9c7f0fc193802fb866063c88e2d3448b6f0d010.tar.bz2 forums-f9c7f0fc193802fb866063c88e2d3448b6f0d010.tar.xz forums-f9c7f0fc193802fb866063c88e2d3448b6f0d010.zip | |
Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/feature/pagination-class:
[ticket/11849] Fix more function calls
[ticket/11849] Update more MCP calls to pagination class
[ticket/11849] Update some ACP modules with new pagination
[ticket/11849] Update rest of the UCP modules
[ticket/11849] Update UCP notifications and pm folder
[ticket/11849] Update search and memberlist
[ticket/11849] Update pagination in viewonline.php
[ticket/11849] Remove old pagination test
[ticket/11849] Update pagination code in viewtopic.php
[ticket/11849] Replace pagination in viewforum.php with class
[ticket/11849] Add service definition
[ticket/11849] Remove pagination functions
[ticket/11849] Test validate_start and on_page
[ticket/11849] Move pagination code to class
Diffstat (limited to 'phpBB/includes/acp/acp_inactive.php')
| -rw-r--r-- | phpBB/includes/acp/acp_inactive.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index de4679b58d..305ba9ac69 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -30,7 +30,7 @@ class acp_inactive function main($id, $mode) { - global $config, $db, $user, $auth, $template; + global $config, $db, $user, $auth, $template, $phpbb_container; global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix; include($phpbb_root_path . 'includes/functions_user.' . $phpEx); @@ -49,6 +49,7 @@ class acp_inactive $form_key = 'acp_inactive'; add_form_key($form_key); + $pagination = $phpbb_container->get('pagination'); // We build the sort key and per page settings here, because they may be needed later @@ -285,7 +286,7 @@ class acp_inactive } $base_url = $this->u_action . "&$u_sort_param&users_per_page=$per_page"; - phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $inactive_count, $per_page, $start); + $pagination->generate_template_pagination($base_url, 'pagination', 'start', $inactive_count, $per_page, $start); $template->assign_vars(array( 'S_INACTIVE_USERS' => true, @@ -294,7 +295,7 @@ class acp_inactive 'S_LIMIT_DAYS' => $s_limit_days, 'S_SORT_KEY' => $s_sort_key, 'S_SORT_DIR' => $s_sort_dir, - 'S_ON_PAGE' => phpbb_on_page($template, $user, $base_url, $inactive_count, $per_page, $start), + 'S_ON_PAGE' => $pagination->on_page($base_url, $inactive_count, $per_page, $start), 'USERS_PER_PAGE' => $per_page, 'U_ACTION' => $this->u_action . "&$u_sort_param&users_per_page=$per_page&start=$start", |