diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-04-18 23:46:26 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-04-18 23:46:26 +0000 |
| commit | 897e0f952d522583ee60efbdf07e7b46ba5fd751 (patch) | |
| tree | 67d64b070288eea75cb0c09032ba787009fc548a | |
| parent | 9a7e40d14261509574a9a9b1c98de295b4de4314 (diff) | |
| download | forums-897e0f952d522583ee60efbdf07e7b46ba5fd751.tar forums-897e0f952d522583ee60efbdf07e7b46ba5fd751.tar.gz forums-897e0f952d522583ee60efbdf07e7b46ba5fd751.tar.bz2 forums-897e0f952d522583ee60efbdf07e7b46ba5fd751.tar.xz forums-897e0f952d522583ee60efbdf07e7b46ba5fd751.zip | |
make it work like viewtopic
git-svn-id: file:///svn/phpbb/trunk@7373 89ea8834-ac86-4346-8a33-228a782c2dd0
| -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; |