From eb56722d2f078b67d333cc976e1631fa8aec7eda Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Wed, 10 Jan 2007 21:20:18 +0000
Subject: #6944

git-svn-id: file:///svn/phpbb/trunk@6877 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/viewtopic.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/viewtopic.php')

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);
 
-- 
cgit v1.2.1