aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDark❶ <dark-1@users.noreply.github.com>2019-07-28 18:06:16 +0530
committerDark❶ <dark-1@users.noreply.github.com>2019-07-28 18:06:16 +0530
commit01d0457f6789dc4bee502b7b0337f29499e744c9 (patch)
tree44c352945d1af408c5e669f434a21b8ab987a027
parent5cd0aad3c6329bcb67de3b2513aa61d397381e1f (diff)
downloadforums-01d0457f6789dc4bee502b7b0337f29499e744c9.tar
forums-01d0457f6789dc4bee502b7b0337f29499e744c9.tar.gz
forums-01d0457f6789dc4bee502b7b0337f29499e744c9.tar.bz2
forums-01d0457f6789dc4bee502b7b0337f29499e744c9.tar.xz
forums-01d0457f6789dc4bee502b7b0337f29499e744c9.zip
[ticket/16111] Add core.message_history_modify_sql_ary
PHPBB3-16111
-rw-r--r--phpBB/includes/functions_privmsgs.php21
1 files changed, 8 insertions, 13 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index fe2308ec29..0806120f21 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1985,15 +1985,6 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
$recipients = array_unique($recipients);
// 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
AND p.author_id = u.user_id
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(
- 'SELECT' => $sql_array['SELECT'],
- 'FROM' => $sql_array['FROM'],
+ 'SELECT' => 'SELECT t.*, p.*, u.*',
+ 'FROM' => array(
+ PRIVMSGS_TABLE => 'p',
+ PRIVMSGS_TO_TABLE => 't',
+ USERS_TABLE => 'u'
+ ),
'LEFT_JOIN' => array(),
-
'WHERE' => $sql_where,
-
'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)));
$sql = $db->sql_build_query('SELECT', $sql_ary);
+ unset($sql_ary);
+
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);