mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 23:37:39 +02:00
Code Issues Releases Wiki Activity

A small correction to #r9763

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9764 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2009-07-17 09:05:09 +00:00
parent a777691994
commit dce2a9b039
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/acp/acp_icons.php
View File

@@ -835,20 +835,19 @@ class acp_icons
);
$spacer = false;
$pagination_start = request_var('start', 0);
$sql = "SELECT COUNT(*) AS count
FROM $table";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$item_count = (int) $db->sql_fetchfield('count');
$db->sql_freeresult($result);
$item_count = $row['count'];
$sql = "SELECT *
FROM $table
ORDER BY {$fields}_order ASC";
$result = $db->sql_query_limit($sql, $config['smilies_per_page'], request_var('start', 0));
$result = $db->sql_query_limit($sql, $config['smilies_per_page'], $pagination_start);
$pagination_start = request_var('start', 0);
while ($row = $db->sql_fetchrow($result))
{
$alt_text = ($mode == 'smilies') ? $row['code'] : '';
@@ -874,6 +873,7 @@ class acp_icons
}
$db->sql_freeresult($result);
$template->assign_var('PAGINATION', generate_pagination(
$this->u_action, $item_count, $config['smilies_per_page'], $pagination_start, true));
}
}

12
phpBB/includes/functions_posting.php
View File

@@ -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)
@@ -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);
}