mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 15:16:16 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'brunoais/ticket/11641' into develop

Browse Source 
* brunoais/ticket/11641:
  [ticket/11641] Use $parse_flags
  [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
This commit is contained in:
Joas Schilling 2013-08-03 17:37:54 +02:00
commit 96cef7f549
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/mcp/mcp_pm_reports.php
View File

@ -115,17 +115,9 @@ class mcp_pm_reports
}
// Process message, leave it uncensored
$message = $pm_info['message_text'];
$parse_flags = ($pm_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
$message = generate_text_for_display($pm_info['message_text'], $pm_info['bbcode_uid'], $pm_info['bbcode_bitfield'], $parse_flags, false);
if ($pm_info['bbcode_bitfield'])
{
include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
$bbcode = new bbcode($pm_info['bbcode_bitfield']);
$bbcode->bbcode_second_pass($message, $pm_info['bbcode_uid'], $pm_info['bbcode_bitfield']);
}
$message = bbcode_nl2br($message);
$message = smiley_text($message);
$report['report_text'] = make_clickable(bbcode_nl2br($report['report_text']));
if ($pm_info['message_attachment'] && $auth->acl_get('u_pm_download'))