Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

2013-02-26 19:25:05 +01:00
parent 98527ce83c 82af5adead
commit 4ba0cf46e8
4 changed files with 116 additions and 131 deletions
@@ -111,7 +111,7 @@ class SearchCore
 			$string = preg_replace('/[^\s]-+/', '', $string);
 		}

-		$blacklist = Configuration::get('PS_SEARCH_BLACKLIST', $id_lang);
+		$blacklist = Tools::strtolower(Configuration::get('PS_SEARCH_BLACKLIST', $id_lang));
 		if (!empty($blacklist))
 		{
 			$string = preg_replace('/(?<=\s)('.$blacklist.')(?=\s)/Su', '', $string);