diff options
author | Drae <paul@starstreak.net> | 2012-07-05 18:56:14 +0100 |
---|---|---|
committer | Drae <paul@starstreak.net> | 2012-07-18 14:31:21 +0100 |
commit | dc71c0629e60acccd39b59538f2e7f5b09b32509 (patch) | |
tree | b87e23a0e29124f25abecb06e2b1252e1d3655c3 /phpBB/includes/ucp/ucp_pm_viewfolder.php | |
parent | [ticket/10968] Render pagination within the template (diff) | |
download | phpbb-dc71c0629e60acccd39b59538f2e7f5b09b32509.tar.gz phpbb-dc71c0629e60acccd39b59538f2e7f5b09b32509.tar.bz2 phpbb-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/ucp/ucp_pm_viewfolder.php')
-rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index 168280bd96..2775dc3eca 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -451,10 +451,11 @@ function get_pm_from($folder_id, $folder, $user_id) $sql_limit_time = ''; } - generate_pagination(append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=view&action=view_folder&f=$folder_id&$u_sort_param"), $pm_count, $config['topics_per_page'], $start); + $base_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=view&action=view_folder&f=$folder_id&$u_sort_param"); + generate_template_pagination($base_url, 'pagination', $pm_count, $config['topics_per_page'], $start); $template->assign_vars(array( - 'PAGE_NUMBER' => on_page($pm_count, $config['topics_per_page'], $start), + 'PAGE_NUMBER' => on_page($base_url, $pm_count, $config['topics_per_page'], $start), 'TOTAL_MESSAGES' => $user->lang('VIEW_PM_MESSAGES', (int) $pm_count), 'POST_IMG' => (!$auth->acl_get('u_sendpm')) ? $user->img('button_topic_locked', 'POST_PM_LOCKED') : $user->img('button_pm_new', 'POST_NEW_PM'), |