diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-07-17 09:05:09 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-07-17 09:05:09 +0000 |
| commit | dce2a9b039184a8c5dddf4825cf0b6b3081bc3fd (patch) | |
| tree | 2dca710c948a835867bdc8293977a8e3a7fc67cb /phpBB/includes/functions_posting.php | |
| parent | a7776919945450eb2c0a37af30b35695f93fae51 (diff) | |
| download | forums-dce2a9b039184a8c5dddf4825cf0b6b3081bc3fd.tar forums-dce2a9b039184a8c5dddf4825cf0b6b3081bc3fd.tar.gz forums-dce2a9b039184a8c5dddf4825cf0b6b3081bc3fd.tar.bz2 forums-dce2a9b039184a8c5dddf4825cf0b6b3081bc3fd.tar.xz forums-dce2a9b039184a8c5dddf4825cf0b6b3081bc3fd.zip | |
A small correction to #r9763
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9764 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 0c5aeb98d6..7db2875cda 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -24,6 +24,8 @@ function generate_smilies($mode, $forum_id) global $auth, $db, $user, $config, $template; global $phpEx, $phpbb_root_path; + $start = request_var('start', 0); + if ($mode == 'window') { if ($forum_id) @@ -43,12 +45,12 @@ function generate_smilies($mode, $forum_id) } page_header($user->lang['SMILIES']); - + $sql = 'SELECT COUNT(smiley_id) AS count FROM ' . SMILIES_TABLE . ' GROUP BY smiley_url'; $result = $db->sql_query($sql, 3600); - + $smiley_count = 0; while ($row = $db->sql_fetchrow($result)) { @@ -59,9 +61,11 @@ function generate_smilies($mode, $forum_id) $template->set_filenames(array( 'body' => 'posting_smilies.html') ); + $template->assign_var('PAGINATION', generate_pagination(append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&f=' . $forum_id), - $smiley_count, $config['smilies_per_page'], request_var('start', 0), true)); + $smiley_count, $config['smilies_per_page'], $start, true) + ); } $display_link = false; @@ -83,8 +87,9 @@ function generate_smilies($mode, $forum_id) { $sql = 'SELECT smiley_url, MIN(emotion) as emotion, MIN(code) AS code, smiley_width, smiley_height FROM ' . SMILIES_TABLE . ' - GROUP BY smiley_url, smiley_width, smiley_height ORDER BY smiley_order'; - $result = $db->sql_query_limit($sql, $config['smilies_per_page'], request_var('start', 0), 3600); + GROUP BY smiley_url, smiley_width, smiley_height + ORDER BY smiley_order'; + $result = $db->sql_query_limit($sql, $config['smilies_per_page'], $start, 3600); } else { @@ -92,7 +97,6 @@ function generate_smilies($mode, $forum_id) FROM ' . SMILIES_TABLE . ' WHERE display_on_posting = 1 ORDER BY smiley_order'; - $result = $db->sql_query($sql, 3600); } |