aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_warn.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/mcp/mcp_warn.php')
-rwxr-xr-xphpBB/includes/mcp/mcp_warn.php5
1 files changed, 2 insertions, 3 deletions
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