diff options
| -rw-r--r-- | phpBB/includes/post.php | 8 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 15 |
2 files changed, 11 insertions, 12 deletions
diff --git a/phpBB/includes/post.php b/phpBB/includes/post.php index 57c6255653..9e135a259c 100644 --- a/phpBB/includes/post.php +++ b/phpBB/includes/post.php @@ -35,7 +35,11 @@ function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid // $message = trim($message); - if($html_on) + if( !$html_on ) + { + $message = htmlspecialchars($message); + } +/* else if($html_on) { $start = -1; $end = 0; @@ -73,7 +77,7 @@ function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid } } } - +*/ if($bbcode_on) { $message = bbencode_first_pass($message, $bbcode_uid); 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('&', '&', $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']) { |