diff options
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index f7cefca462..a0f10dd09b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2507,7 +2507,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags) return ''; } - $text = str_replace("\n", '<br />', censor_text($text)); + $text = censor_text($text); // Parse bbcode if bbcode uid stored and bbcode enabled if ($uid && ($flags & OPTION_FLAG_BBCODE)) @@ -2530,6 +2530,8 @@ function generate_text_for_display($text, $uid, $bitfield, $flags) $bbcode->bbcode_second_pass($text, $uid); } + $text = str_replace("\n", '<br />', $text); + $text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES)); return $text; |