diff options
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 65ffee8dd0..d2e54e1404 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1138,6 +1138,9 @@ class parse_message extends bbcode_firstpass $this->parse($allow_bbcode, $allow_magic_url, $allow_smilies, $this->allow_img_bbcode, $this->allow_flash_bbcode, $this->allow_quote_bbcode, $this->allow_url_bbcode, true); } + // Replace naughty words such as farty pants + $this->message = censor_text($this->message); + // Parse BBcode if ($allow_bbcode) { @@ -1147,11 +1150,9 @@ class parse_message extends bbcode_firstpass $this->bbcode_second_pass($this->message, $this->bbcode_uid); } + $this->message = bbcode_nl2br($this->message); $this->message = smiley_text($this->message, !$allow_smilies); - // Replace naughty words such as farty pants - $this->message = str_replace("\n", '<br />', censor_text($this->message)); - if (!$update_this_message) { unset($this->message); |