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

2013-04-23 11:39:14 +02:00
parent 8251e98323 da96eb6651
commit e61bd7c185
34 changed files with 261 additions and 213 deletions
@@ -984,7 +984,7 @@ class ToolsCore

 		if (function_exists('mb_strtolower'))
 			$str = mb_strtolower($str, 'utf-8');
-		elseif (!$allow_accented_chars)
+		if (!$allow_accented_chars)
 			$str = Tools::replaceAccentedChars($str);

 		// Remove all non-whitelist chars.