diff options
| author | Drae <paul@starstreak.net> | 2012-07-08 21:07:28 +0100 |
|---|---|---|
| committer | Drae <paul@starstreak.net> | 2012-07-18 14:32:18 +0100 |
| commit | 27d8aef528460e87efc90bc4fffc82c0d1fa87d9 (patch) | |
| tree | 91628c158d80d76bac305a9933ec8b74b5336b96 /phpBB/includes/ucp/ucp_pm_viewfolder.php | |
| parent | cf4d6e926dd83d61073ac355cdaf7778a18dcbf8 (diff) | |
| download | forums-27d8aef528460e87efc90bc4fffc82c0d1fa87d9.tar forums-27d8aef528460e87efc90bc4fffc82c0d1fa87d9.tar.gz forums-27d8aef528460e87efc90bc4fffc82c0d1fa87d9.tar.bz2 forums-27d8aef528460e87efc90bc4fffc82c0d1fa87d9.tar.xz forums-27d8aef528460e87efc90bc4fffc82c0d1fa87d9.zip | |
[feature/pagination-as-list] Updates for nils comments
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.
PHPBB3-10968
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewfolder.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index c6fd5fbea0..a4f6583518 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -452,10 +452,10 @@ function get_pm_from($folder_id, $folder, $user_id) } $base_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=view&action=view_folder&f=$folder_id&$u_sort_param"); - phpbb_generate_template_pagination($base_url, 'pagination', $pm_count, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($template, $base_url, 'pagination', $pm_count, $config['topics_per_page'], $start); $template->assign_vars(array( - 'PAGE_NUMBER' => on_page($base_url, $pm_count, $config['topics_per_page'], $start), + 'PAGE_NUMBER' => phpbb_on_page($template, $user, $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'), |