diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-10-21 17:51:29 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-10-21 17:51:29 +0200 |
| commit | b0b3810aab2474fdd7ea93c98da0ef01c9958dfd (patch) | |
| tree | bcd6c12125018e967933619c5d14d164c259d23e /phpBB/includes | |
| parent | a8fb843ded90590f1dd38d7ee16ac730d0d51bb2 (diff) | |
| parent | fa18778c913dc1fafc6baaadf42def2bab4dc248 (diff) | |
| download | forums-b0b3810aab2474fdd7ea93c98da0ef01c9958dfd.tar forums-b0b3810aab2474fdd7ea93c98da0ef01c9958dfd.tar.gz forums-b0b3810aab2474fdd7ea93c98da0ef01c9958dfd.tar.bz2 forums-b0b3810aab2474fdd7ea93c98da0ef01c9958dfd.tar.xz forums-b0b3810aab2474fdd7ea93c98da0ef01c9958dfd.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 53081f14fc..45eda4ba17 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -52,9 +52,29 @@ function generate_smilies($mode, $forum_id) page_header($user->lang['SMILIES']); - $sql = 'SELECT COUNT(smiley_id) AS item_count - FROM ' . SMILIES_TABLE . ' - GROUP BY smiley_url'; + $sql_ary = [ + 'SELECT' => 'COUNT(s.smiley_id) AS item_count', + 'FROM' => [ + SMILIES_TABLE => 's', + ], + 'GROUP_BY' => 's.smiley_url', + ]; + + /** + * Modify SQL query that fetches the total number of smilies in window mode + * + * @event core.generate_smilies_count_sql_before + * @var int forum_id Forum where smilies are generated + * @var array sql_ary Array with the SQL query + * @since 3.2.9-RC1 + */ + $vars = [ + 'forum_id', + 'sql_ary', + ]; + extract($phpbb_dispatcher->trigger_event('core.generate_smilies_count_sql_before', compact($vars))); + + $sql = $db->sql_build_query('SELECT', $sql_ary); $result = $db->sql_query($sql, 3600); $smiley_count = 0; |