From c01597499cbfbce0a429b7196a315e1643d9e5c2 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 6 Mar 2006 14:03:56 +0000
Subject: - added "display_on_posting" setting to custom bbcodes (creates a
 button with the bbcode tag) - fixed forum editing and parent id selection -
 completely removed HTML support (it only creates security problems) - changed
 cache_moderators() to reflect permission changes

git-svn-id: file:///svn/phpbb/trunk@5603 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/viewtopic.php | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'phpBB/viewtopic.php')

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 079b4ae0fc..843b4c2c02 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -818,7 +818,6 @@ while ($row = $db->sql_fetchrow($result))
 		'post_encoding'		=> $row['post_encoding'],
 		'bbcode_uid'		=> $row['bbcode_uid'],
 		'bbcode_bitfield'	=> $row['bbcode_bitfield'],
-		'enable_html'		=> $row['enable_html'],
 		'enable_smilies'	=> $row['enable_smilies'],
 		'enable_sig'		=> $row['enable_sig'],
 		'friend'			=> $row['friend'],
@@ -1139,12 +1138,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 	// Parse the message and subject
 	$message = $row['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', $forum_id) && $row['enable_html'])
-	{
-		$message = preg_replace('#(<!\-\- h \-\-><)([\/]?.*?)(><!\-\- h \-\->)#is', "&lt;\\2&gt;", $message);
-	}
-
 	// Second parse bbcode here
 	if ($row['bbcode_bitfield'])
 	{
@@ -1171,12 +1164,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 		$message = preg_replace('#(?!<.*)(?<!\w)(' . $highlight_match . ')(?!\w|[^<>]*>)#i', '<span class="posthilit">\1</span>', $message);
 	}
 
-	if ($row['enable_html'] && $auth->acl_get('f_html', $forum_id))
-	{
-		// Remove Comments from post content
-		$message = preg_replace('#<!\-\-(.*?)\-\->#is', '', $message);
-	}
-
 	// Replace naughty words such as farty pants
 	$row['post_subject'] = censor_text($row['post_subject']);
 	$message = str_replace("\n", '<br />', censor_text($message));
-- 
cgit v1.2.1