makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16425] Added table alias

Browse source 
PHPBB3-16425
This commit is contained in:
kasimi 2020-04-05 16:02:32 +02:00
parent 21dbabe6f2
commit 6cab639d8e
No known key found for this signature in database
GPG key ID: 3163AB573241193A
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/functions_posting.php
View file

@ -110,23 +110,23 @@ function generate_smilies($mode, $forum_id)
if ($mode == 'window') if ($mode == 'window')
{ {
$sql_ary = [ $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' => [ 'FROM' => [
SMILIES_TABLE => 's', SMILIES_TABLE => 's',
], ],
'GROUP_BY' => 'smiley_url, smiley_width, smiley_height', 'GROUP_BY' => 's.smiley_url, s.smiley_width, s.smiley_height',
'ORDER_BY' => 'min_smiley_order', 'ORDER_BY' => 's.min_smiley_order',
]; ];
} }
else else
{ {
$sql_ary = [ $sql_ary = [
'SELECT' => '*', 'SELECT' => 's.*',
'FROM' => [ 'FROM' => [
SMILIES_TABLE => 's', SMILIES_TABLE => 's',
], ],
'WHERE' => 'display_on_posting = 1', 'WHERE' => 's.display_on_posting = 1',
'ORDER_BY' => 'smiley_order', 'ORDER_BY' => 's.smiley_order',
]; ];
} }