3 files changed, 1 insertions, 22 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 06c06cd98a..0143957223 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -847,7 +847,6 @@ function mcp_fork_topic($topic_ids)
 					'post_approved'		=> 1,
 					'post_reported'		=> 0,
 					'enable_bbcode'		=> (int) $row['enable_bbcode'],
-					'enable_html'		=> (int) $row['enable_html'],
 					'enable_smilies'	=> (int) $row['enable_smilies'],
 					'enable_magic_url'	=> (int) $row['enable_magic_url'],
 					'enable_sig'		=> (int) $row['enable_sig'],
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 317713625f..044c261873 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -105,13 +105,6 @@ function mcp_topic_view($id, $mode, $action)
 		$message = $row['post_text'];
 		$post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title'];
 
-		// If the board has HTML off but the post has HTML
-		// on then we process it, else leave it alone
-		if (!$config['allow_html'] && $row['enable_html'])
-		{
-			$message = preg_replace('#(<)([\/]?.*?)(>)#is', '&lt;\\2&gt;', $message);
-		}
-
 		if ($row['bbcode_bitfield'])
 		{
 			$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 9872387b78..d0ffb37874 100755
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -262,12 +262,6 @@ function mcp_warn_post_view($id, $mode, $action)
 	// Parse the message and subject
 	$message = $userrow['post_text'];
 
-	// If the board has HTML off but the post has HTML on then we process it, else leave it alone
-	if (!$auth->acl_get('f_html', $userrow['forum_id']) && $row['enable_html'])
-	{
-		$message = preg_replace('#(<!\-\- h \-\-><)([\/]?.*?)(><!\-\- h \-\->)#is', "&lt;\\2&gt;", $message);
-	}
-
 	// Second parse bbcode here
 	if ($userrow['bbcode_bitfield'])
 	{
@@ -277,12 +271,6 @@ function mcp_warn_post_view($id, $mode, $action)
 	// Always process smilies after parsing bbcodes
 	$message = smiley_text($message);
 
-	if ($userrow['enable_html'] && $auth->acl_get('f_html', $userrow['forum_id']))
-	{
-		// Remove Comments from post content
-		$message = preg_replace('#<!\-\-(.*?)\-\->#is', '', $message);
-	}
-
 	// Replace naughty words such as farty pants
 	$message = str_replace("\n", '<br />', censor_text($message));
 
@@ -391,7 +379,7 @@ function add_warning($userrow, $warning, $send_pm = true, $post_id = 0)
 		$message_parser = new parse_message();
 		$message_parser->message = sprintf($lang['WARNING_PM_BODY'], $warning);
 		$message_md5 = md5($message_parser->message);
-		$message_parser->parse(false, true, true, true, false, false, true);
+		$message_parser->parse(true, true, true, false, false, true);
 
 		$pm_data = array(
 			'from_user_id'			=> $user->data['user_id'],
@@ -399,7 +387,6 @@ function add_warning($userrow, $warning, $send_pm = true, $post_id = 0)
 			'from_username'			=> $user->data['username'],
 			'enable_sig'			=> false,
 			'enable_bbcode'			=> true,
-			'enable_html' 			=> false,
 			'enable_smilies'		=> true,
 			'enable_urls'			=> false,
 			'icon_id'				=> 0,