aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php15
1 files changed, 5 insertions, 10 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index ec3c790763..4e788a0d84 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -480,31 +480,26 @@ for($i = 0; $i < $total_posts; $i++)
$user_sig = htmlspecialchars($user_sig);
}
$message = htmlspecialchars($message);
+// $message = str_replace('&amp;', '&', $message);
}
- if($board_config['allow_bbcode'])
+ if($board_config['allow_bbcode'] && $bbcode_uid != "")
{
if($user_sig != "")
{
- //
- // Move this to profile? Well, first pass
- //
$sig_uid = make_bbcode_uid();
$user_sig = bbencode_first_pass($user_sig, $sig_uid);
$user_sig = bbencode_second_pass($user_sig, $sig_uid);
- $user_sig = str_replace("\n", "<br />", $user_sig);
}
- if($postrow[$i]['allow_bbcode'])
- {
- $message = bbencode_second_pass($message, $bbcode_uid);
- }
+ $message = bbencode_second_pass($message, $bbcode_uid);
}
$message = make_clickable($message);
- $message = str_replace("\n", "<br />", $message);
$message = ($user_sig != "") ? ereg_replace("\[addsig]$", "<br /><br />_________________<br />" . $user_sig, $message) : ereg_replace("\[addsig]$", "", $message);
+
+ $message = str_replace("\n", "<br />", $message);
if($board_config['allow_smilies'] && $postrow[$i]['enable_smilies'])
{