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/search.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'phpBB/search.php')

diff --git a/phpBB/search.php b/phpBB/search.php
index e6ff66ff7e..a27c479eae 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -471,6 +471,7 @@ if ($keywords || $author || $search_id)
 						AND t.topic_id = tp.topic_id)';
 					$sql_select .= ', tp.topic_posted';
 				}
+
 				if ($config['load_db_lastread'])
 				{
 					$sql_from .= ' LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.user_id = ' . $user->data['user_id'] . '
@@ -611,11 +612,6 @@ if ($keywords || $author || $search_id)
 					continue;
 				}
 
-				if ($row['enable_html'])
-				{
-					$row['post_text'] = preg_replace('#(<!\-\- h \-\-><)([\/]?.*?)(><!\-\- h \-\->)#is', "&lt;\\2&gt;", $row['post_text']);
-				}
-
 				decode_message($row['post_text'], $row['bbcode_uid']);
 
 				if ($return_chars != -1)
-- 
cgit v1.2.1