aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarek A. R <aptx@phpbb.com>2009-12-24 00:47:00 +0000
committerMarek A. R <aptx@phpbb.com>2009-12-24 00:47:00 +0000
commitf601599e634096bbc0634f39a9cf596c9606e263 (patch)
treeb2d1f84780e055cd148c030cb3d5cf42a96c5f65 /phpBB/includes
parentdd02aed6e129e9c14bcc5c53ce41973c61bdde9e (diff)
downloadforums-f601599e634096bbc0634f39a9cf596c9606e263.tar
forums-f601599e634096bbc0634f39a9cf596c9606e263.tar.gz
forums-f601599e634096bbc0634f39a9cf596c9606e263.tar.bz2
forums-f601599e634096bbc0634f39a9cf596c9606e263.tar.xz
forums-f601599e634096bbc0634f39a9cf596c9606e263.zip
Fix for #54945
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10378 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_posting.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 069740ebda..5f72d8d899 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -88,7 +88,7 @@ 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';
+ ORDER BY MIN(smiley_order)';
$result = $db->sql_query_limit($sql, $config['smilies_per_page'], $start, 3600);
}
else