diff options
| author | Bruno Ais <brunoaiss@gmail.com> | 2012-12-02 23:01:29 +0000 |
|---|---|---|
| committer | Bruno Ais <brunoaiss@gmail.com> | 2012-12-07 08:53:05 +0000 |
| commit | 83a71a2e777dcc9d1c717b6bf438b9aaf41dffba (patch) | |
| tree | 7394aafbeb55fd61efd3758361f0fd94506beca1 | |
| parent | 25780c17a4e9c1e96e8f1648bd9bd16ff06afb7f (diff) | |
| download | forums-83a71a2e777dcc9d1c717b6bf438b9aaf41dffba.tar forums-83a71a2e777dcc9d1c717b6bf438b9aaf41dffba.tar.gz forums-83a71a2e777dcc9d1c717b6bf438b9aaf41dffba.tar.bz2 forums-83a71a2e777dcc9d1c717b6bf438b9aaf41dffba.tar.xz forums-83a71a2e777dcc9d1c717b6bf438b9aaf41dffba.zip | |
[ticket/11171] Use the options stored to decide how to show it
Added what's needed so that the post in the report is parsed the
same way as it was being parsed when the post was reported
PHPBB3-11171
| -rw-r--r-- | phpBB/includes/mcp/mcp_reports.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 3426d62cdb..ca730f7728 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -71,7 +71,7 @@ class mcp_reports // closed reports are accessed by report id $report_id = request_var('r', 0); - $sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, r.reported_post_text, r.reported_post_uid, r.reported_post_bitfield, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour + $sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, r.reported_post_text, r.reported_post_uid, r.reported_post_bitfield, r.reported_post_enable_magic_url, r.reported_post_enable_smilies, r.reported_post_enable_bbcode, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . ' u WHERE ' . (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id") . ' AND rr.reason_id = r.reason_id @@ -94,6 +94,10 @@ class mcp_reports $post_id = $report['post_id']; $report_id = $report['report_id']; + + $parse_post_flags = $report['reported_post_enable_bbcode'] ? OPTION_FLAG_BBCODE : 0; + $parse_post_flags += $report['reported_post_enable_smilies'] ? OPTION_FLAG_SMILIES : 0; + $parse_post_flags += $report['reported_post_enable_magic_url'] ? OPTION_FLAG_LINKS : 0; $post_info = get_post_data(array($post_id), 'm_report', true); @@ -227,7 +231,7 @@ class mcp_reports 'REPORTER_NAME' => get_username_string('username', $report['user_id'], $report['username'], $report['user_colour']), 'U_VIEW_REPORTER_PROFILE' => get_username_string('profile', $report['user_id'], $report['username'], $report['user_colour']), - 'POST_PREVIEW' => generate_text_for_display($report['reported_post_text'], $report['reported_post_uid'], $report['reported_post_bitfield'], OPTION_FLAG_BBCODE | OPTION_FLAG_SMILIES, false), + 'POST_PREVIEW' => generate_text_for_display($report['reported_post_text'], $report['reported_post_uid'], $report['reported_post_bitfield'], $parse_post_flags, false), 'POST_SUBJECT' => ($post_info['post_subject']) ? $post_info['post_subject'] : $user->lang['NO_SUBJECT'], 'POST_DATE' => $user->format_date($post_info['post_time']), 'POST_IP' => $post_info['poster_ip'], |