diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2012-12-02 23:19:59 +0000 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2012-12-07 08:53:17 +0000 |
| commit | 73971ef0fa2a53b056847a524bb84f8b2d3e5a4b (patch) | |
| tree | 2cdd7f4b7e0469cefa73606b98f32bf29543bc67 | |
| parent | 91246c20fa8b9218fe0ddc8b52236d4b878346dd (diff) | |
| download | forums-73971ef0fa2a53b056847a524bb84f8b2d3e5a4b.tar forums-73971ef0fa2a53b056847a524bb84f8b2d3e5a4b.tar.gz forums-73971ef0fa2a53b056847a524bb84f8b2d3e5a4b.tar.bz2 forums-73971ef0fa2a53b056847a524bb84f8b2d3e5a4b.tar.xz forums-73971ef0fa2a53b056847a524bb84f8b2d3e5a4b.zip | |
[ticket/11171] Cleanup of leftovers
I didn't notice that there were actually leftovers from the other
PR. Anyway, this will remove all the leftovers I noticed from the
other PR.
PHPBB3-11171
| -rw-r--r-- | phpBB/includes/mcp/mcp_reports.php | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index ca730f7728..8da303f6e3 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -140,18 +140,7 @@ class mcp_reports $post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false; - // Process message, leave it uncensored - $message = $post_info['post_text']; - if ($post_info['bbcode_bitfield']) - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode($post_info['bbcode_bitfield']); - $bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message); $report['report_text'] = make_clickable(bbcode_nl2br($report['report_text'])); if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) @@ -172,7 +161,7 @@ class mcp_reports if (sizeof($attachments)) { $update_count = array(); - parse_attachments($post_info['forum_id'], $message, $attachments, $update_count); + parse_attachments($post_info['forum_id'], $report['reported_post_text'], $attachments, $update_count); } // Display not already displayed Attachments for this post, we already parsed them. ;) |