mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-06 15:45:34 +02:00
- Bug #1210
git-svn-id: file:///svn/phpbb/trunk@5832 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
67c580e148
commit
9404dfe2fb
@ -56,14 +56,17 @@ function generate_smilies($mode, $forum_id)
|
|||||||
$db->sql_freeresult($result);
|
$db->sql_freeresult($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$last_url = '';
|
||||||
|
|
||||||
$sql = 'SELECT *
|
$sql = 'SELECT *
|
||||||
FROM ' . SMILIES_TABLE .
|
FROM ' . SMILIES_TABLE .
|
||||||
(($mode == 'inline') ? ' WHERE display_on_posting = 1 ' : '') . '
|
(($mode == 'inline') ? ' WHERE display_on_posting = 1 ' : '') . '
|
||||||
GROUP BY smiley_url
|
|
||||||
ORDER BY smiley_order';
|
ORDER BY smiley_order';
|
||||||
$result = $db->sql_query($sql, 3600);
|
$result = $db->sql_query($sql, 3600);
|
||||||
|
|
||||||
while ($row = $db->sql_fetchrow($result))
|
while ($row = $db->sql_fetchrow($result))
|
||||||
|
{
|
||||||
|
if ($row['smiley_url'] !== $last_url)
|
||||||
{
|
{
|
||||||
$template->assign_block_vars('smiley', array(
|
$template->assign_block_vars('smiley', array(
|
||||||
'SMILEY_CODE' => $row['code'],
|
'SMILEY_CODE' => $row['code'],
|
||||||
@ -73,6 +76,8 @@ function generate_smilies($mode, $forum_id)
|
|||||||
'SMILEY_DESC' => $row['emotion'])
|
'SMILEY_DESC' => $row['emotion'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
$last_url = $row['smiley_url'];
|
||||||
|
}
|
||||||
$db->sql_freeresult($result);
|
$db->sql_freeresult($result);
|
||||||
|
|
||||||
if ($mode == 'inline' && $display_link)
|
if ($mode == 'inline' && $display_link)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user