aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_queue.php
diff options
context:
space:
mode:
authorDrae <paul@starstreak.net>2012-07-05 18:56:14 +0100
committerDrae <paul@starstreak.net>2012-07-18 14:31:21 +0100
commitdc71c0629e60acccd39b59538f2e7f5b09b32509 (patch)
treeb87e23a0e29124f25abecb06e2b1252e1d3655c3 /phpBB/includes/mcp/mcp_queue.php
parent922147f05a75d5a0e00b34f0102bc014583df984 (diff)
downloadforums-dc71c0629e60acccd39b59538f2e7f5b09b32509.tar
forums-dc71c0629e60acccd39b59538f2e7f5b09b32509.tar.gz
forums-dc71c0629e60acccd39b59538f2e7f5b09b32509.tar.bz2
forums-dc71c0629e60acccd39b59538f2e7f5b09b32509.tar.xz
forums-dc71c0629e60acccd39b59538f2e7f5b09b32509.zip
[feature/pagination-as-list] Various fixes and improvements
Extracted common template code for prosilver as per subsilver2. Various other fixups and oversight corrections, changed name of the "new" template function and re-introduced existing version. Altered on_page to compensate for removal of some templating vars from pagination routine. PHPBB3-10968
Diffstat (limited to 'phpBB/includes/mcp/mcp_queue.php')
-rw-r--r--phpBB/includes/mcp/mcp_queue.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 86fffbcf93..c1998c73d3 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -419,7 +419,8 @@ class mcp_queue
}
unset($rowset, $forum_names);
- generate_pagination($this->u_action . "&amp;f=$forum_id&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir", $total, $config['topics_per_page'], $start);
+ $base_url = $this->u_action . "&amp;f=$forum_id&amp;st=$sort_days&amp;sk=$sort_key&amp;sd=$sort_dir";
+ generate_template_pagination($base_url, 'pagination', $total, $config['topics_per_page'], $start);
// Now display the page
$template->assign_vars(array(
@@ -432,7 +433,7 @@ class mcp_queue
'S_MCP_ACTION' => build_url(array('t', 'f', 'sd', 'st', 'sk')),
'S_TOPICS' => ($mode == 'unapproved_posts') ? false : true,
- 'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start),
+ 'PAGE_NUMBER' => on_page($base_url, $total, $config['topics_per_page'], $start),
'TOPIC_ID' => $topic_id,
'TOTAL' => $user->lang((($mode == 'unapproved_posts') ? 'VIEW_TOPIC_POSTS' : 'VIEW_FORUM_TOPICS'), (int) $total),
));