diff options
| author | Drae <paul@starstreak.net> | 2012-07-06 14:44:04 +0100 |
|---|---|---|
| committer | Drae <paul@starstreak.net> | 2012-07-18 14:31:50 +0100 |
| commit | cf4d6e926dd83d61073ac355cdaf7778a18dcbf8 (patch) | |
| tree | e1f4e755a159d65bee8c0e569bf74ce4a8434f45 /phpBB/includes/ucp | |
| parent | dc71c0629e60acccd39b59538f2e7f5b09b32509 (diff) | |
| download | forums-cf4d6e926dd83d61073ac355cdaf7778a18dcbf8.tar forums-cf4d6e926dd83d61073ac355cdaf7778a18dcbf8.tar.gz forums-cf4d6e926dd83d61073ac355cdaf7778a18dcbf8.tar.bz2 forums-cf4d6e926dd83d61073ac355cdaf7778a18dcbf8.tar.xz forums-cf4d6e926dd83d61073ac355cdaf7778a18dcbf8.zip | |
[feature/pagination-as-list] Rename and deprecate functions
Returned and marked deprecated topic_generate_pagination. Rename
new function in line with coding guidelines.
PHPBB3-10968
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_attachments.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php index 56a87f616f..406866a141 100644 --- a/phpBB/includes/ucp/ucp_attachments.php +++ b/phpBB/includes/ucp/ucp_attachments.php @@ -171,7 +171,7 @@ class ucp_attachments $db->sql_freeresult($result); $base_url = $this->u_action . "&sk=$sort_key&sd=$sort_dir"; - generate_template_pagination($base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $num_attachments, $config['topics_per_page'], $start); $template->assign_vars(array( 'PAGE_NUMBER' => on_page($base_url, $num_attachments, $config['topics_per_page'], $start), diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index a72c7fb023..fc09307ffb 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -845,7 +845,7 @@ class ucp_groups } $base_url = $this->u_action . "&action=$action&g=$group_id"; - generate_template_pagination($base_url, 'pagination', $total_members, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($base_url, 'pagination', $total_members, $config['topics_per_page'], $start); $template->assign_vars(array( 'S_LIST' => true, diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index d07d838227..0c28fbecf1 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -670,7 +670,7 @@ class ucp_main if ($topics_count) { - generate_template_pagination($this->u_action, 'pagination', $topics_count, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($this->u_action, 'pagination', $topics_count, $config['topics_per_page'], $start); $template->assign_vars(array( 'PAGE_NUMBER' => on_page($this->u_action, $topics_count, $config['topics_per_page'], $start), @@ -838,7 +838,7 @@ class ucp_main 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), )); - generate_template_pagination(append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . "&t=$topic_id"), 'topicrow.pagination', $replies + 1, $config['posts_per_page'], 1, true, true); + phpbb_generate_template_pagination(append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . "&t=$topic_id"), 'topicrow.pagination', $replies + 1, $config['posts_per_page'], 1, true, true); } } } diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index 2775dc3eca..c6fd5fbea0 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -452,7 +452,7 @@ 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"); - generate_template_pagination($base_url, 'pagination', $pm_count, $config['topics_per_page'], $start); + phpbb_generate_template_pagination($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), |