diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-01-10 21:20:18 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-01-10 21:20:18 +0000 |
| commit | eb56722d2f078b67d333cc976e1631fa8aec7eda (patch) | |
| tree | 537e2a8b78d06072ee3c540ebe2f45dcc57a20a0 /phpBB/viewtopic.php | |
| parent | 8e1adf93b61828923090f2f5c8324d8c45c9c54a (diff) | |
| download | forums-eb56722d2f078b67d333cc976e1631fa8aec7eda.tar forums-eb56722d2f078b67d333cc976e1631fa8aec7eda.tar.gz forums-eb56722d2f078b67d333cc976e1631fa8aec7eda.tar.bz2 forums-eb56722d2f078b67d333cc976e1631fa8aec7eda.tar.xz forums-eb56722d2f078b67d333cc976e1631fa8aec7eda.zip | |
#6944
git-svn-id: file:///svn/phpbb/trunk@6877 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 1f1c1acb6a..ffcc826f7b 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1234,7 +1234,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) // Parse the message and subject $message = censor_text($row['post_text']); - $message = str_replace("\n", '<br />', $message); // Second parse bbcode here if ($row['bbcode_bitfield']) @@ -1242,6 +1241,8 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); } + $message = str_replace("\n", '<br />', $message); + // Always process smilies after parsing bbcodes $message = smiley_text($message); |