// Merge -> revision 9352

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-10-14 08:20:54 +00:00
parent cb175ba261
commit 45645f1f50
332 changed files with 6104 additions and 2643 deletions
+2 -2
View File
@@ -547,7 +547,7 @@ class LanguageCore extends ObjectModel
public static function getIdByIso($iso_code)
{
if (!Validate::isLanguageIsoCode($iso_code))
die(Tools::displayError('Fatal error : iso code is not correct : ').$iso_code);
die(Tools::displayError('Fatal error: ISO code is not correct').' '.$iso_code);
return Db::getInstance()->getValue('SELECT `id_lang` FROM `'._DB_PREFIX_.'lang` WHERE `iso_code` = \''.pSQL(strtolower($iso_code)).'\'');
}
@@ -555,7 +555,7 @@ class LanguageCore extends ObjectModel
public static function getLanguageCodeByIso($iso_code)
{
if (!Validate::isLanguageIsoCode($iso_code))
die(Tools::displayError('Fatal error : iso code is not correct : ').$iso_code);
die(Tools::displayError('Fatal error: ISO code is not correct').' '.$iso_code);
return Db::getInstance()->getValue('SELECT `language_code` FROM `'._DB_PREFIX_.'lang` WHERE `iso_code` = \''.pSQL(strtolower($iso_code)).'\'');
}