From 21dbabe6f20c058aee0271ef8ecc77c0e93e264d Mon Sep 17 00:00:00 2001 From: kasimi Date: Sun, 5 Apr 2020 11:12:21 +0200 Subject: [PATCH 1/4] [ticket/16425] Add event core.generate_smilies_modify_sql PHPBB3-16425 --- phpBB/includes/functions_posting.php | 51 +++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 0ea6adb308..0e127410e3 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -109,18 +109,51 @@ 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, MIN(smiley_order) AS min_smiley_order - FROM ' . SMILIES_TABLE . ' - GROUP BY smiley_url, smiley_width, smiley_height - ORDER BY min_smiley_order'; + $sql_ary = [ + '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 => 's', + ], + 'GROUP_BY' => 'smiley_url, smiley_width, smiley_height', + 'ORDER_BY' => 'min_smiley_order', + ]; + } + else + { + $sql_ary = [ + 'SELECT' => '*', + 'FROM' => [ + SMILIES_TABLE => 's', + ], + 'WHERE' => 'display_on_posting = 1', + 'ORDER_BY' => 'smiley_order', + ]; + } + + /** + * Modify the SQL query that fetches the smilies + * + * @event core.generate_smilies_modify_sql + * @var string mode Smiley mode, either window or inline + * @var int forum_id Forum where smilies are generated, or 0 if composing a private message + * @var array sql_ary Array with SQL query data + * @since 3.2.10-RC1 + */ + $vars = [ + 'mode', + 'forum_id', + 'sql_ary', + ]; + extract($phpbb_dispatcher->trigger_event('core.generate_smilies_modify_sql', compact($vars))); + + $sql = $db->sql_build_query('SELECT', $sql_ary); + + if ($mode == 'window') + { $result = $db->sql_query_limit($sql, $config['smilies_per_page'], $start, 3600); } else { - $sql = 'SELECT * - FROM ' . SMILIES_TABLE . ' - WHERE display_on_posting = 1 - ORDER BY smiley_order'; $result = $db->sql_query($sql, 3600); } @@ -139,7 +172,7 @@ function generate_smilies($mode, $forum_id) * * @event core.generate_smilies_modify_rowset * @var string mode Smiley mode, either window or inline - * @var int forum_id Forum where smilies are generated + * @var int forum_id Forum where smilies are generated, or 0 if composing a private message * @var array smilies Smiley rows fetched from the database * @since 3.2.9-RC1 */ From 6cab639d8e9fb476e1bf14c3075de980beb78c73 Mon Sep 17 00:00:00 2001 From: kasimi Date: Sun, 5 Apr 2020 16:02:32 +0200 Subject: [PATCH 2/4] [ticket/16425] Added table alias PHPBB3-16425 --- phpBB/includes/functions_posting.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 0e127410e3..cbda7daf09 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -110,23 +110,23 @@ function generate_smilies($mode, $forum_id) if ($mode == 'window') { $sql_ary = [ - 'SELECT' => 'smiley_url, MIN(emotion) as emotion, MIN(code) AS code, smiley_width, smiley_height, MIN(smiley_order) AS min_smiley_order', + 'SELECT' => 's.smiley_url, MIN(s.emotion) AS emotion, MIN(s.code) AS code, s.smiley_width, s.smiley_height, MIN(s.smiley_order) AS min_smiley_order', 'FROM' => [ SMILIES_TABLE => 's', ], - 'GROUP_BY' => 'smiley_url, smiley_width, smiley_height', - 'ORDER_BY' => 'min_smiley_order', + 'GROUP_BY' => 's.smiley_url, s.smiley_width, s.smiley_height', + 'ORDER_BY' => 's.min_smiley_order', ]; } else { $sql_ary = [ - 'SELECT' => '*', + 'SELECT' => 's.*', 'FROM' => [ SMILIES_TABLE => 's', ], - 'WHERE' => 'display_on_posting = 1', - 'ORDER_BY' => 'smiley_order', + 'WHERE' => 's.display_on_posting = 1', + 'ORDER_BY' => 's.smiley_order', ]; } From d927154217cd7e89d5ef92856b1a4709f39a0481 Mon Sep 17 00:00:00 2001 From: kasimi Date: Thu, 9 Apr 2020 17:12:06 +0200 Subject: [PATCH 3/4] [ticket/16425] Removed whitespace PHPBB3-16425 --- phpBB/includes/functions_posting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index cbda7daf09..6859f86b06 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -129,7 +129,7 @@ function generate_smilies($mode, $forum_id) 'ORDER_BY' => 's.smiley_order', ]; } - + /** * Modify the SQL query that fetches the smilies * From 09ce2ab70ec1a692f8289ad4b8e19fc6f5fa1ad3 Mon Sep 17 00:00:00 2001 From: kasimi Date: Tue, 21 Apr 2020 23:47:09 +0200 Subject: [PATCH 4/4] [ticket/16425] Added @since 3.3.1-RC1 PHPBB3-16425 --- phpBB/includes/functions_posting.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 6859f86b06..0ac983c769 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -138,6 +138,7 @@ function generate_smilies($mode, $forum_id) * @var int forum_id Forum where smilies are generated, or 0 if composing a private message * @var array sql_ary Array with SQL query data * @since 3.2.10-RC1 + * @since 3.3.1-RC1 */ $vars = [ 'mode',