From 9705e1883dd19bbe27176accf8cf481b2e59815a Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Mon, 5 May 2014 10:45:46 -0700
Subject: [PATCH 1/2] [ticket/12501] Parse the reported post message before its
 attachments.

This ensures that the empty lines from attachment.html aren't converted into
<br />.

PHPBB3-12501
---
 phpBB/includes/mcp/mcp_reports.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 5681b83212..f3b151edda 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -143,6 +143,13 @@ 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;
+				$message = generate_text_for_display(
+					$report['reported_post_text'],
+					$report['reported_post_uid'],
+					$report['reported_post_bitfield'],
+					$parse_post_flags,
+					false
+				);
 
 				$report['report_text'] = make_clickable(bbcode_nl2br($report['report_text']));
 
@@ -164,7 +171,7 @@ class mcp_reports
 					if (sizeof($attachments))
 					{
 						$update_count = array();
-						parse_attachments($post_info['forum_id'], $report['reported_post_text'], $attachments, $update_count);
+						parse_attachments($post_info['forum_id'], $message, $attachments, $update_count);
 					}
 
 					// Display not already displayed Attachments for this post, we already parsed them. ;)
@@ -224,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'], $parse_post_flags, false),
+					'POST_PREVIEW'			=> $message,
 					'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'],

From 7b0e535f0371626826da14e189acc2e409e525c6 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Mon, 5 May 2014 10:54:39 -0700
Subject: [PATCH 2/2] [ticket/12501] Only select attachments uploaded before
 the post was reported.

The post text displayed to the user is the same as when it was reported, even if
the post was edited afterwards, thus it follows that the attachments would be
the same. This also addresses an issue where the index in the attachment bbcode
no longer matches that of its corresponding attachment when new attachments
are uploaded after the post is reported.

PHPBB3-12501
---
 phpBB/includes/mcp/mcp_reports.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index f3b151edda..e73ef2b78f 100644
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -159,6 +159,7 @@ class mcp_reports
 						FROM ' . ATTACHMENTS_TABLE . '
 						WHERE post_msg_id = ' . $post_id . '
 							AND in_message = 0
+							AND filetime <= ' . (int) $report['report_time'] . '
 						ORDER BY filetime DESC';
 					$result = $db->sql_query($sql);