aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_reports.php
diff options
context:
space:
mode:
authorBruno Ais <brunoaiss@gmail.com>2012-05-01 12:28:53 +0100
committerBruno Ais <brunoaiss@gmail.com>2012-05-01 12:44:34 +0100
commit06f4ef8852ef137b4a721c89a8e7535151df9811 (patch)
tree9de2b50a7d8f8e0fdf8315cbbe3a7778d50b6e22 /phpBB/includes/mcp/mcp_reports.php
parentf3e5acf3776083ec39052a3b8bf179638703d47e (diff)
downloadforums-06f4ef8852ef137b4a721c89a8e7535151df9811.tar
forums-06f4ef8852ef137b4a721c89a8e7535151df9811.tar.gz
forums-06f4ef8852ef137b4a721c89a8e7535151df9811.tar.bz2
forums-06f4ef8852ef137b4a721c89a8e7535151df9811.tar.xz
forums-06f4ef8852ef137b4a721c89a8e7535151df9811.zip
[ticket/10845] Now it shows the preview post parsed
With this addition, the preview post in the report details now shows with the BBCode parsed. Note: Tested with all BBCodes I have including one personalised to write the <s> BBCode. PHPBB3-10845
Diffstat (limited to 'phpBB/includes/mcp/mcp_reports.php')
-rw-r--r--phpBB/includes/mcp/mcp_reports.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 69c6a4cfff..d71c111486 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, 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, 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
@@ -227,7 +227,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' => bbcode_nl2br($report['reported_post_text']),
+ 'POST_PREVIEW' => bbcode_nl2br(generate_text_for_display($report['reported_post_text'], $report['reported_post_uid'], $report['reported_post_bitfield'], OPTION_FLAG_BBCODE + OPTION_FLAG_SMILIES + OPTION_FLAG_LINKS)),
'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'],