From 198e75245d83ff11bb29dfdc1095a91a56fd83cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Mon, 21 Oct 2013 09:41:00 +0200
Subject: [PATCH] [-] FO: Don't auto detect language if it not associated to
 the shop #PSCFV-10273

---
 classes/Tools.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index d10f4929a..c7a82201d 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -357,13 +357,11 @@ class ToolsCore
 			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;
-				}					
+				}
 			}
 		}