5 files changed, 13 insertions, 8 deletions
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 698bcc8dd6..32fb572d3f 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -112,13 +112,15 @@ function mcp_post_details($id, $mode, $action)
 
 	// Process message, leave it uncensored
 	$message = $post_info['post_text'];
-	$message = str_replace("\n", '<br />', $message);
+
 	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);
 
 	if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
@@ -261,7 +263,7 @@ function mcp_post_details($id, $mode, $action)
 					'U_REPORTER'	=> ($row['user_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u=' . $row['user_id']) : '',
 					'USER_NOTIFY'	=> ($row['user_notify']) ? true : false,
 					'REPORT_TIME'	=> $user->format_date($row['report_time']),
-					'REPORT_TEXT'	=> str_replace("\n", '<br />', trim($row['report_text'])))
+					'REPORT_TEXT'	=> bbcode_nl2br(trim($row['report_text']))))
 				);
 			}
 			while ($row = $db->sql_fetchrow($result));
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index f82a99c2c3..0d2ea76498 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -119,13 +119,15 @@ class mcp_queue
 
 				// Process message, leave it uncensored
 				$message = $post_info['post_text'];
-				$message = str_replace("\n", '<br />', $message);
+
 				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);
 
 				if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 9a06b3bbf2..9528eec33b 100755
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -128,13 +128,15 @@ class mcp_reports
 
 				// Process message, leave it uncensored
 				$message = $post_info['post_text'];
-				$message = str_replace("\n", '<br />', $message);
+
 				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);
 
 				if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index a5bfba23fe..1002b1c918 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -175,13 +175,13 @@ function mcp_topic_view($id, $mode, $action)
 	{
 		$message = $row['post_text'];
 		$post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title'];
-		$message = str_replace("\n", '<br />', $message);
 
 		if ($row['bbcode_bitfield'])
 		{
 			$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
 		}
 
+		$message = bbcode_nl2br($message);
 		$message = smiley_text($message);
 
 		if (!empty($attachments[$row['post_id']]))
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 915df898f7..892929539f 100755
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -253,8 +253,7 @@ class mcp_warn
 		
 		// We want to make the message available here as a reminder
 		// Parse the message and subject
-		$message = $user_row['post_text'];
-		$message = str_replace("\n", '<br />', censor_text($message));
+		$message = censor_text($user_row['post_text']);
 
 		// Second parse bbcode here
 		if ($user_row['bbcode_bitfield'])
@@ -265,7 +264,7 @@ class mcp_warn
 			$bbcode->bbcode_second_pass($message, $user_row['bbcode_uid'], $user_row['bbcode_bitfield']);
 		}
 
-		// Always process smilies after parsing bbcodes
+		$message = bbcode_nl2br($message);
 		$message = smiley_text($message);
 
 		// Generate the appropriate user information for the user we are looking at