Index: branches/5.2.x/core/kernel/db/cat_event_handler.php
===================================================================
diff -u -N -r15145 -r15314
--- branches/5.2.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 15145)
+++ branches/5.2.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 15314)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_event_handler.php 15145 2012-03-04 09:04:08Z alex $
+* @version	$Id: cat_event_handler.php 15314 2012-04-20 12:30:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1090,7 +1090,7 @@
 		$event->redirect = false;
 		$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
 
-		$keywords = kUtil::unhtmlentities( trim($this->Application->GetVar('keywords')) );
+		$keywords = htmlspecialchars_decode( trim($this->Application->GetVar('keywords')) );
 
 		$query_object = $this->Application->recallObject('HTTPQuery');
 		/* @var $query_object kHTTPQuery */
@@ -1634,14 +1634,14 @@
 		$condition = '';
 		switch ($record['FieldType']) {
 			case 'select':
-				$keywords[$field] = kUtil::unhtmlentities( $keywords[$field] );
+				$keywords[$field] = htmlspecialchars_decode( $keywords[$field] );
 				if ($keywords[$field]) {
 					$condition = sprintf($condition_patterns['is'], $field_name, $this->Conn->qstr( $keywords[$field] ));
 				}
 				break;
 
 			case 'multiselect':
-				$keywords[$field] = kUtil::unhtmlentities( $keywords[$field] );
+				$keywords[$field] = htmlspecialchars_decode( $keywords[$field] );
 				if ($keywords[$field]) {
 					$condition = Array ();
 					$values = explode('|', substr($keywords[$field], 1, -1));
@@ -1653,7 +1653,7 @@
 				break;
 
 			case 'text':
-				$keywords[$field] = kUtil::unhtmlentities( $keywords[$field] );
+				$keywords[$field] = htmlspecialchars_decode( $keywords[$field] );
 
 				if (mb_strlen($keywords[$field]) >= $this->Application->ConfigValue('Search_MinKeyword_Length')) {
 					$highlight_keywords[] = $keywords[$field];