Index: trunk/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r4446 -r4476
--- trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4446)
+++ trunk/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4476)
@@ -607,11 +607,7 @@
 		$event->redirect = false;
 		$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
 
-		$keywords = trim($this->Application->GetVar('keywords'));
-		if( !$this->Application->GetVar('INPORTAL_ON') )
-		{
-			$keywords = unhtmlentities($keywords);
-		}
+		$keywords = unhtmlentities( trim($this->Application->GetVar('keywords')) );
 
 		$query_object =& $this->Application->recallObject('HTTPQuery');
 		$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
@@ -934,10 +930,7 @@
 			switch($record['FieldType'])
 			{
 				case 'text':
-					if( !$this->Application->GetVar('INPORTAL_ON') )
-					{
 					$keywords[$field] = unhtmlentities( $keywords[$field] );
-					}
 
 					if(strlen($keywords[$field]) >= $this->Application->ConfigValue('Search_MinKeyword_Length'))
 					{