diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-08-03 17:37:54 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-08-03 17:37:54 +0200 |
| commit | 96cef7f5495bc9242a6629691205ea16da887904 (patch) | |
| tree | f5ebf26344f23c362d6661f75067372f5555dc3d /phpBB | |
| parent | bef1bac895cb7ffc03f5f993a284c17aa22056f8 (diff) | |
| parent | 2f251972790e7836d9c35eb2f5b49fda97f736d6 (diff) | |
| download | forums-96cef7f5495bc9242a6629691205ea16da887904.tar forums-96cef7f5495bc9242a6629691205ea16da887904.tar.gz forums-96cef7f5495bc9242a6629691205ea16da887904.tar.bz2 forums-96cef7f5495bc9242a6629691205ea16da887904.tar.xz forums-96cef7f5495bc9242a6629691205ea16da887904.zip | |
Merge remote-tracking branch 'brunoais/ticket/11641' into develop
* brunoais/ticket/11641:
[ticket/11641] Use $parse_flags
[ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/mcp/mcp_pm_reports.php | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php index 99ff397a66..cb61b25174 100644 --- a/phpBB/includes/mcp/mcp_pm_reports.php +++ b/phpBB/includes/mcp/mcp_pm_reports.php @@ -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')) |