mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2020-08-06 17:23:05 +02:00
parent 2828d57f5f 2a8239075e
commit 21d656907a
21 changed files with 351 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/includes/functions_privmsgs.php
View File

@@ -2048,6 +2048,8 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
while ($row = $db->sql_fetchrow($result));
$db->sql_freeresult($result);
$url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm');
/**
* Modify message rows before displaying the history in private messages
*
@@ -2082,7 +2084,6 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
$title = censor_text($title);
$url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm');
$next_history_pm = $previous_history_pm = $prev_id = 0;
// Re-order rowset to be able to get the next/prev message rows...