mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 07:58:56 +02:00
Code Issues Releases Wiki Activity

[ticket/16111] Add core.message_history_modify_sql_ary

Browse Source 
PHPBB3-16111
This commit is contained in:
Dark❶ 2019-07-28 18:06:16 +05:30
parent 5cd0aad3c6
commit 01d0457f67
No known key found for this signature in database
GPG Key ID: FAE32A15F9132DE8
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/includes/functions_privmsgs.php
View File

@ -1985,15 +1985,6 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
$recipients = array_unique($recipients); $recipients = array_unique($recipients);
// Get History Messages (could be newer) // Get History Messages (could be newer)
$sql_array = array(
'SELECT' => 'SELECT t.*, p.*, u.*',
'FROM' => array(
PRIVMSGS_TABLE => 'p',
PRIVMSGS_TO_TABLE => 't',
USERS_TABLE => 'u'
)
);
$sql_where = 't.msg_id = p.msg_id $sql_where = 't.msg_id = p.msg_id
AND p.author_id = u.user_id AND p.author_id = u.user_id
AND t.folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ') AND t.folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ')
@ -2013,12 +2004,14 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
} }
$sql_ary = array( $sql_ary = array(
'SELECT' => $sql_array['SELECT'], 'SELECT' => 'SELECT t.*, p.*, u.*',
'FROM' => $sql_array['FROM'], 'FROM' => array(
PRIVMSGS_TABLE => 'p',
PRIVMSGS_TO_TABLE => 't',
USERS_TABLE => 'u'
),
'LEFT_JOIN' => array(), 'LEFT_JOIN' => array(),
'WHERE' => $sql_where, 'WHERE' => $sql_where,
'ORDER_BY' => 'p.message_time DESC', 'ORDER_BY' => 'p.message_time DESC',
); );
@ -2033,6 +2026,8 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
extract($phpbb_dispatcher->trigger_event('core.message_history_modify_sql_ary', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.message_history_modify_sql_ary', compact($vars)));
$sql = $db->sql_build_query('SELECT', $sql_ary); $sql = $db->sql_build_query('SELECT', $sql_ary);
unset($sql_ary);
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);