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

…PSCFV-10273
PrestaShop · Oct 21, 2013 · 198e752 · 198e752
1 parent 8ef22c3
commit 198e752
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/classes/Tools.php b/classes/Tools.php
@@ -357,13 +357,11 @@ public static function setCookieLanguage($cookie = null)
 			if (Validate::isLanguageIsoCode($string))
 			{
 				$lang = new Language(Language::getIdByIso($string));
-				if (Validate::isLoadedObject($lang) && $lang->active)
-				{				
-					$language = new Language((int)$lang->id);
-					if (Validate::isLoadedObject($language))
-						Context::getContext()->language = $language;				
+				if (Validate::isLoadedObject($lang) && $lang->active && $lang->isAssociatedToShop())
+				{
+					Context::getContext()->language = $lang;
 					$cookie->id_lang = (int)$lang->id;
-				}					
+				}
 			}
 		}