diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-02-15 02:35:19 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-02-15 02:35:19 +0100 |
| commit | ccf12ba166299af5e09f2b2d9b77125f2fe033e9 (patch) | |
| tree | d8cb6286eff190f3ecba789e8d95b71de4bc88aa /phpBB/includes | |
| parent | 06581ba9276310d6f845c84d16fd6c47d66544bf (diff) | |
| parent | 779868e4f4b08c4cf0bcb117bda80f427f81e781 (diff) | |
| download | forums-ccf12ba166299af5e09f2b2d9b77125f2fe033e9.tar forums-ccf12ba166299af5e09f2b2d9b77125f2fe033e9.tar.gz forums-ccf12ba166299af5e09f2b2d9b77125f2fe033e9.tar.bz2 forums-ccf12ba166299af5e09f2b2d9b77125f2fe033e9.tar.xz forums-ccf12ba166299af5e09f2b2d9b77125f2fe033e9.zip | |
Merge pull request #1964 from prototech/ticket/12136
[ticket/12136] Use new pagination class in generate_smilies().
* prototech/ticket/12136:
[ticket/12136] Use new pagination class in generate_smilies().
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index e14e9e27be..30ffbb55dc 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -21,8 +21,10 @@ if (!defined('IN_PHPBB')) function generate_smilies($mode, $forum_id) { global $db, $user, $config, $template, $phpbb_dispatcher; - global $phpEx, $phpbb_root_path; + global $phpEx, $phpbb_root_path, $phpbb_container; + $base_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&f=' . $forum_id); + $pagination = $phpbb_container->get('pagination'); $start = request_var('start', 0); if ($mode == 'window') @@ -61,7 +63,8 @@ function generate_smilies($mode, $forum_id) 'body' => 'posting_smilies.html') ); - generate_pagination(append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&f=' . $forum_id), $smiley_count, $config['smilies_per_page'], $start); + $start = $pagination->validate_start($start, $config['smilies_per_page'], $smiley_count); + $pagination->generate_template_pagination($base_url, 'pagination', 'start', $smiley_count, $config['smilies_per_page'], $start); } $display_link = false; @@ -139,8 +142,8 @@ function generate_smilies($mode, $forum_id) { $template->assign_vars(array( 'S_SHOW_SMILEY_LINK' => true, - 'U_MORE_SMILIES' => append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&f=' . $forum_id)) - ); + 'U_MORE_SMILIES' => $base_url, + )); } if ($mode == 'window') |