diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-02-08 16:54:39 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-02-08 16:54:39 +0000 |
| commit | 8682f644e558fff6e82978865a75c9cc6868023a (patch) | |
| tree | fd5a6f4d3737cf9751ff6599e52ae947faed201b /phpBB/includes/functions_posting.php | |
| parent | f631d62508230393db97b2d1822018dcdbefb86e (diff) | |
| download | forums-8682f644e558fff6e82978865a75c9cc6868023a.tar forums-8682f644e558fff6e82978865a75c9cc6868023a.tar.gz forums-8682f644e558fff6e82978865a75c9cc6868023a.tar.bz2 forums-8682f644e558fff6e82978865a75c9cc6868023a.tar.xz forums-8682f644e558fff6e82978865a75c9cc6868023a.zip | |
Merge r10484 and r10485 into 3.0.7 branch.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10486 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 0a31ea49a8..49ea382411 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -46,7 +46,7 @@ function generate_smilies($mode, $forum_id) page_header($user->lang['SMILIES']); - $sql = 'SELECT COUNT(smiley_id) AS count + $sql = 'SELECT COUNT(smiley_id) AS item_count FROM ' . SMILIES_TABLE . ' GROUP BY smiley_url'; $result = $db->sql_query($sql, 3600); |