makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1964 from prototech/ticket/12136

Browse source 
[ticket/12136] Use new pagination class in generate_smilies().

* prototech/ticket/12136:
  [ticket/12136] Use new pagination class in generate_smilies().
This commit is contained in:
Andreas Fischer 2014-02-15 02:35:19 +01:00
commit ccf12ba166
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/includes/functions_posting.php
View file

@ -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')