diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-12 15:53:08 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-18 18:36:08 +0100 |
| commit | e4950ced9261c42b0cfb856d69054d93ed2c0768 (patch) | |
| tree | a11ccd517fc6479bf3188eefda8c9cc4f628a8c5 /phpBB/includes/ucp/ucp_attachments.php | |
| parent | a5b55e5ab4c063914228a36d32d541ddd0f67c36 (diff) | |
| download | forums-e4950ced9261c42b0cfb856d69054d93ed2c0768.tar forums-e4950ced9261c42b0cfb856d69054d93ed2c0768.tar.gz forums-e4950ced9261c42b0cfb856d69054d93ed2c0768.tar.bz2 forums-e4950ced9261c42b0cfb856d69054d93ed2c0768.tar.xz forums-e4950ced9261c42b0cfb856d69054d93ed2c0768.zip | |
[ticket/11849] Update rest of the UCP modules
PHPBB3-11849
Diffstat (limited to 'phpBB/includes/ucp/ucp_attachments.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_attachments.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php index dc095e7b73..e687ee9cdc 100644 --- a/phpBB/includes/ucp/ucp_attachments.php +++ b/phpBB/includes/ucp/ucp_attachments.php @@ -26,7 +26,7 @@ class ucp_attachments function main($id, $mode) { - global $template, $user, $db, $config, $phpEx, $phpbb_root_path; + global $template, $user, $db, $config, $phpEx, $phpbb_root_path, $phpbb_container; $start = request_var('start', 0); $sort_key = request_var('sk', 'a'); @@ -119,6 +119,10 @@ class ucp_attachments $num_attachments = $db->sql_fetchfield('num_attachments'); $db->sql_freeresult($result); + // Ensure start is a valid value + $pagination = $phpbb_container->get('pagination'); + $start = $pagination->validate_start($start, $config['topics_per_page'], $num_attachments); + $sql = 'SELECT a.*, t.topic_title, p.message_subject as message_title FROM ' . ATTACHMENTS_TABLE . ' a LEFT JOIN ' . TOPICS_TABLE . ' t ON (a.topic_id = t.topic_id AND a.in_message = 0) @@ -171,10 +175,10 @@ class ucp_attachments $db->sql_freeresult($result); $base_url = $this->u_action . "&sk=$sort_key&sd=$sort_dir"; - phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $num_attachments, $config['topics_per_page'], $start); + $pagination->generate_template_pagination($base_url, 'pagination', 'start', $num_attachments, $config['topics_per_page'], $start); $template->assign_vars(array( - 'PAGE_NUMBER' => phpbb_on_page($template, $user, $base_url, $num_attachments, $config['topics_per_page'], $start), + 'PAGE_NUMBER' => $pagination->on_page($base_url, $num_attachments, $config['topics_per_page'], $start), 'TOTAL_ATTACHMENTS' => $num_attachments, 'L_TITLE' => $user->lang['UCP_ATTACHMENTS'], |