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/mcp/mcp_queue.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/mcp/mcp_queue.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 0318bc5e15..3b6897f4e1 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -337,6 +337,7 @@ class mcp_queue $topic_id = $request->variable('t', 0); $forum_info = array(); + $pagination = $phpbb_container->get('pagination'); if ($topic_id) { @@ -532,7 +533,7 @@ class mcp_queue unset($rowset, $forum_names); $base_url = $this->u_action . "&f=$forum_id&st=$sort_days&sk=$sort_key&sd=$sort_dir"; - phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total, $config['topics_per_page'], $start); + $pagination->generate_template_pagination($base_url, 'pagination', 'start', $total, $config['topics_per_page'], $start); // Now display the page $template->assign_vars(array( @@ -546,7 +547,7 @@ class mcp_queue 'S_TOPICS' => $is_topics, 'S_RESTORE' => $is_restore, - 'PAGE_NUMBER' => phpbb_on_page($template, $user, $base_url, $total, $config['topics_per_page'], $start), + 'PAGE_NUMBER' => $pagination->on_page($base_url, $total, $config['topics_per_page'], $start), 'TOPIC_ID' => $topic_id, 'TOTAL' => $user->lang(((!$is_topics) ? 'VIEW_TOPIC_POSTS' : 'VIEW_FORUM_TOPICS'), (int) $total), )); |