[-] MO : Mondialrelay, merge 1.4 => 1.5

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10898 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vSchoener
2011-12-05 10:46:33 +00:00
parent f7250f76d5
commit 19656ae993
8 changed files with 369 additions and 309 deletions
+4 -4
View File
@@ -37,10 +37,10 @@ class MRTools
{
if (function_exists('iconv'))
{
$currentLocale = setlocale(LC_ALL, NULL);
setlocale(LC_ALL, 'en_US.UTF8');
$cleanedString = iconv('UTF-8','ASCII//TRANSLIT', $string);
setLocale(LC_ALL, $currentLocale);
$currentLocale = setlocale(LC_ALL, NULL);
setlocale(LC_ALL, 'en_US.UTF8');
$cleanedString = iconv('UTF-8','ASCII//TRANSLIT', $string);
setLocale(LC_ALL, $currentLocale);
}
else
$cleanedString = strtr($string,