Index: branches/5.1.x/core/units/helpers/search_helper.php
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/units/helpers/search_helper.php	(.../search_helper.php)	(revision 12657)
+++ branches/5.1.x/core/units/helpers/search_helper.php	(.../search_helper.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: search_helper.php 12365 2009-08-22 19:11:51Z alex $
+* @version	$Id: search_helper.php 13086 2010-01-12 19:47:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -9,7 +9,7 @@
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
+* See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
@@ -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();
@@ -71,37 +82,36 @@
 
 				switch ($sign) {
 					case '+':
-						$plus_conditions[] = implode(' LIKE "%'.$keyword.'%" OR ', $fields).' LIKE "%'.$keyword.'%"';
+						$plus_conditions[] = implode(" LIKE '%" . $keyword . "%' OR ", $fields) . " LIKE '%" . $keyword . "%'";
 						break;
 
 					case '-':
 						foreach ($fields as $field) {
-							$condition[] = $field.' NOT LIKE "%'.$keyword.'%" OR '.$field.' IS NULL';
+							$condition[] = $field . " NOT LIKE '%" . $keyword . "%' OR " . $field . ' IS NULL';
 						}
-						$minus_conditions[] = '('.implode(') AND (', $condition).')';
+						$minus_conditions[] = '(' . implode(') AND (', $condition) . ')';
 						break;
 
 					case '':
-						$keyword = str_replace('"', '\"', $keyword);
-						$normal_conditions[] = implode(' LIKE "%'.$keyword.'%" OR ', $fields).' LIKE "%'.$keyword.'%"';
+						$normal_conditions[] = implode(" LIKE '%" . $keyword . "%' OR ", $fields) . " LIKE '%" . $keyword . "%'";
 						break;
 				}
 			}
 
 			// building where clause
 			if ($normal_conditions) {
-				$where_clause = '('.implode(') OR (', $normal_conditions).')';
+				$where_clause = '(' . implode(') OR (', $normal_conditions) . ')';
 			}
 			else {
 				$where_clause = '1';
 			}
 
 			if ($plus_conditions) {
-				$where_clause = '('.$where_clause.') AND ('.implode(') AND (', $plus_conditions).')';
+				$where_clause = '(' . $where_clause . ') AND (' . implode(') AND (', $plus_conditions) . ')';
 			}
 
 			if ($minus_conditions) {
-				$where_clause = '('.$where_clause.') AND ('.implode(') AND (', $minus_conditions).')';
+				$where_clause = '(' . $where_clause . ') AND (' . implode(') AND (', $minus_conditions) . ')';
 			}
 
 			return $where_clause;
@@ -176,7 +186,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 +263,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';