Index: branches/5.0.x/core/kernel/db/cat_event_handler.php
===================================================================
diff -u -N -r12789 -r12896
--- branches/5.0.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 12789)
+++ branches/5.0.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 12896)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_event_handler.php 12789 2009-10-25 20:56:43Z alex $
+* @version	$Id: cat_event_handler.php 12896 2009-11-10 17:40:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1067,8 +1067,6 @@
 
 		$this->saveToSearchLog($keywords, 0); // 0 - simple search, 1 - advanced search
 
-		$keywords = strtr($keywords, Array('%' => '\\%', '_' => '\\_'));
-
 		$event->setPseudoClass('_List');
 
 		$object =& $event->getObject();
@@ -1230,7 +1228,8 @@
 		reset($search_config);
 
 		foreach ($positive_words as $keyword_index => $positive_word) {
-			$positive_words[$keyword_index] = mysql_real_escape_string($positive_word);
+			$positive_word = $search_helper->transformWildcards($positive_word);
+			$positive_words[$keyword_index] = $this->Conn->escape($positive_word);
 		}
 
 		foreach ($field_list as $field) {