diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2013-07-16 21:01:47 +0100 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2013-07-16 21:01:47 +0100 |
| commit | e1e8d4ed347cb1707ee4cfca8d05e679b575fe0c (patch) | |
| tree | 2bb61733d7abd9cd17b7d9eed3035d1f70150169 | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-e1e8d4ed347cb1707ee4cfca8d05e679b575fe0c.tar forums-e1e8d4ed347cb1707ee4cfca8d05e679b575fe0c.tar.gz forums-e1e8d4ed347cb1707ee4cfca8d05e679b575fe0c.tar.bz2 forums-e1e8d4ed347cb1707ee4cfca8d05e679b575fe0c.tar.xz forums-e1e8d4ed347cb1707ee4cfca8d05e679b575fe0c.zip | |
[ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11641
| -rw-r--r-- | phpBB/includes/mcp/mcp_pm_reports.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php index 99ff397a66..dc953aae33 100644 --- a/phpBB/includes/mcp/mcp_pm_reports.php +++ b/phpBB/includes/mcp/mcp_pm_reports.php @@ -115,17 +115,8 @@ class mcp_pm_reports } // Process message, leave it uncensored - $message = $pm_info['message_text']; + $message = generate_text_for_display($pm_info['message_text'], $pm_info['bbcode_uid'], $pm_info['bbcode_bitfield'], ($pm_info['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, 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')) |