From 9899e2b975e13d512cfc9e5d8ac25617130150b7 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Fri, 10 Aug 2001 22:00:12 +0000
Subject: Various posting updates

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

(limited to 'phpBB/viewtopic.php')

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 4e788a0d84..2b2a1a3194 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -480,7 +480,6 @@ 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'] && $bbcode_uid != "")
@@ -493,6 +492,20 @@ for($i = 0; $i < $total_posts; $i++)
 		}
 
 		$message = bbencode_second_pass($message, $bbcode_uid);
+
+		//
+		// This compensates for bbcode's rather agressive (but I guess necessary) 
+		// HTML handling
+		//
+		if(!$postrow[$i]['enable_html'] || ($postrow[$i]['enable_html'] && !$board_config['allow_html']) )
+		{
+			$message = preg_replace("'&amp;'", "&", $message);
+		}
+	}
+	else
+	{
+		// Removes UID from BBCode entries
+		$message = preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
 	}
 
 	$message = make_clickable($message);
-- 
cgit v1.2.1