dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO: Don't auto detect language if it not associated to the shop #PSCFV-10273

Browse Source
This commit is contained in:
Rémi Gaillard
2013-10-21 09:41:00 +02:00
parent 8ef22c3548
commit 198e75245d
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+4 -6
View File
@@ -357,13 +357,11 @@ class ToolsCore
if (Validate::isLanguageIsoCode($string)) if (Validate::isLanguageIsoCode($string))
{ {
$lang = new Language(Language::getIdByIso($string)); $lang = new Language(Language::getIdByIso($string));
if (Validate::isLoadedObject($lang) && $lang->active) if (Validate::isLoadedObject($lang) && $lang->active && $lang->isAssociatedToShop())
{ {
$language = new Language((int)$lang->id); Context::getContext()->language = $lang;
if (Validate::isLoadedObject($language))
Context::getContext()->language = $language;
$cookie->id_lang = (int)$lang->id; $cookie->id_lang = (int)$lang->id;
} }
} }
} }