aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_posting.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:09:11 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:09:11 +0100
commit35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40 (patch)
tree098e3b3e043f6c3e31c9c922287f76e5ec726e03 /phpBB/includes/functions_posting.php
parent3b46681652ad0c235ccdcafc449c3d759335df17 (diff)
parent05b5dc316779f67641e17859d5c69f296b24288d (diff)
downloadforums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar
forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar.gz
forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar.bz2
forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar.xz
forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.zip
Merge commit 'release-3.0.7-RC2'
Diffstat (limited to 'phpBB/includes/functions_posting.php')
-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 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);