Index: branches/unlabeled/unlabeled-1.42.2/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r4395 -r4396
--- branches/unlabeled/unlabeled-1.42.2/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4395)
+++ branches/unlabeled/unlabeled-1.42.2/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 4396)
@@ -611,7 +611,11 @@
 		$event->redirect = false;
 		$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
 
-		$keywords = unhtmlentities( trim($this->Application->GetVar('keywords')) );
+		$keywords = trim($this->Application->GetVar('keywords'));
+		if( !$this->Application->GetVar('INPORTAL_ON') )
+		{
+			$keywords = unhtmlentities($keywords);
+		}
 
 		$query_object =& $this->Application->recallObject('HTTPQuery');
 		$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
@@ -934,7 +938,10 @@
 			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'))
 					{