From adcdca708dfd9d229828c865b30c44a57057fced Mon Sep 17 00:00:00 2001
From: vChabot <vincent.chabot@prestashop.com>
Date: Mon, 11 Jun 2012 13:37:16 +0000
Subject: [PATCH] [-] BO : BugFix : #PSCFV-2761 : Change a default language by
 shop is not possible

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15966 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Tools.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index f0ecf6992..743b47973 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -377,7 +377,11 @@ class ToolsCore
 			$context = Context::getContext();
 
 		// update language only if new id is different from old id
-		if (($id_lang = (int)Tools::getValue('id_lang')) && Validate::isUnsignedId($id_lang) && $context->cookie->id_lang != (int)$id_lang)
+		// or if default language changed
+		$cookie_id_lang = $context->cookie->id_lang;
+		$configuration_id_lang = Configuration::get('PS_LANG_DEFAULT', null, null, $context->shop->id);
+		if ((($id_lang = (int)Tools::getValue('id_lang')) && Validate::isUnsignedId($id_lang) && $cookie_id_lang != (int)$id_lang)
+			|| (($id_lang = $configuration_id_lang) && Validate::isUnsignedId($id_lang) && $id_lang != $cookie_id_lang))
 		{
 			$context->cookie->id_lang = $id_lang;
 			$language = new Language($id_lang);