diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 21:15:13 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 21:15:13 +0100 |
| commit | f493509eb2237bb44c760b487b813f0e9bf26401 (patch) | |
| tree | 9001b727fe232c7cffa5e5e968800d0e22e7a65b | |
| parent | 72e2af08e14abd32aec0187fb644bfadd158fc79 (diff) | |
| parent | 93a2407f6549a0236741973c1fdc980539ce6c0c (diff) | |
| download | forums-f493509eb2237bb44c760b487b813f0e9bf26401.tar forums-f493509eb2237bb44c760b487b813f0e9bf26401.tar.gz forums-f493509eb2237bb44c760b487b813f0e9bf26401.tar.bz2 forums-f493509eb2237bb44c760b487b813f0e9bf26401.tar.xz forums-f493509eb2237bb44c760b487b813f0e9bf26401.zip | |
Merge branch 'bug/aptx/54945' into develop-olympus
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 49ea382411..21c5fe7aca 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -85,10 +85,10 @@ function generate_smilies($mode, $forum_id) if ($mode == 'window') { - $sql = 'SELECT smiley_url, MIN(emotion) as emotion, MIN(code) AS code, smiley_width, smiley_height + $sql = 'SELECT smiley_url, MIN(emotion) as emotion, MIN(code) AS code, smiley_width, smiley_height, MIN(smiley_order) AS min_smiley_order FROM ' . SMILIES_TABLE . ' GROUP BY smiley_url, smiley_width, smiley_height - ORDER BY MIN(smiley_order)'; + ORDER BY min_smiley_order'; $result = $db->sql_query_limit($sql, $config['smilies_per_page'], $start, 3600); } else |