In-Portal Issue Tracker

Index: kernel/db/cat_event_handler.php
===================================================================
--- kernel/db/cat_event_handler.php	(revision 12883)
+++ kernel/db/cat_event_handler.php	(working copy)
@@ -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) {
Index: kernel/db/db_connection.php
===================================================================
--- kernel/db/db_connection.php	(revision 12883)
+++ kernel/db/db_connection.php	(working copy)
@@ -605,7 +605,10 @@
 				return 'NULL';
 			}
 
-			return mysql_real_escape_string($string, $this->connectionID);
+			$string = mysql_real_escape_string($string, $this->connectionID);
+
+			// prevent double-escaping of MySQL wildcard symbols ("%" and  "_") in case if they were already escaped
+			return str_replace(Array ('\\\\%', '\\\\_'), Array ('\\%', '\\_'), $string);
 		}
 
 		/**
Index: units/categories/categories_event_handler.php
===================================================================
--- units/categories/categories_event_handler.php	(revision 12889)
+++ units/categories/categories_event_handler.php	(working copy)
@@ -2316,7 +2316,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) {
Index: units/helpers/search_helper.php
===================================================================
--- units/helpers/search_helper.php	(revision 12883)
+++ units/helpers/search_helper.php	(working copy)
@@ -58,9 +58,20 @@
 			return $ret;
 		}
 
+		/**
+		 * Replace wildcards to match MySQL
+		 *
+		 * @param string $keyword
+		 * @return string
+		 */
+		function transformWildcards($keyword)
+		{
+			return str_replace(Array ('%', '_', '*', '?') , Array ('\%', '\_', '%', '_'), $keyword);
+		}
+
 		function buildWhereClause($keyword, $fields)
 		{
-			$keywords = $this->splitKeyword($keyword);
+			$keywords = $this->splitKeyword( $this->transformWildcards($keyword) );
 
 			$normal_conditions = Array();
 			$plus_conditions = Array();
@@ -176,7 +187,6 @@
 			// process search keyword
 			$search_keyword = $this->Application->GetVar( $event->getPrefixSpecial(true).'_search_keyword');
 			$this->Application->StoreVar( $event->getPrefixSpecial().'_search_keyword', $search_keyword);
-			$search_keyword = str_replace('*', '%', $search_keyword);
 
 			$custom_filter = $this->processCustomFilters($event);
 
@@ -254,6 +264,7 @@
 							$match_to = mb_strtolower($use_phrases ? $this->Application->Phrase($val) : $val);
 
 							foreach ($search_keywords as $keyword => $sign) {
+								// doesn't support wildcards
 								if (strpos($match_to, mb_strtolower($keyword)) === false) {
 									if ($sign == '+') {
 										$filter_value = $table_name.'`'.$field_name.'` = NULL';