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_icons.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_icons.php')
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 658be4cc6b..f9295e2b47 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -27,7 +27,7 @@ class acp_icons { global $db, $user, $auth, $template, $cache; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; - global $request; + global $request, $phpbb_container; $user->add_lang('acp/posting'); @@ -893,6 +893,7 @@ class acp_icons ); $spacer = false; + $pagination = $phpbb_container->get('pagination'); $pagination_start = request_var('start', 0); $item_count = $this->item_count($table); @@ -927,7 +928,7 @@ class acp_icons } $db->sql_freeresult($result); - phpbb_generate_template_pagination($template, $this->u_action, 'pagination', 'start', $item_count, $config['smilies_per_page'], $pagination_start); + $pagination->generate_template_pagination($this->u_action, 'pagination', 'start', $item_count, $config['smilies_per_page'], $pagination_start); } /** |