From bfa82c9648f1836c741ea964dbbe3a66a49ede01 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Tue, 9 Jul 2013 10:59:25 +0200 Subject: [PATCH] [-] FO : you cannot access the front office with a disabled language anymore #PSCFV-9714 --- classes/Tools.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/classes/Tools.php b/classes/Tools.php index e49080443..fab8c7385 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -338,11 +338,9 @@ class ToolsCore /* If language does not exist or is disabled, erase it */ if ($cookie->id_lang) { - //echo $cookie->id_lang;exit; $lang = new Language((int)$cookie->id_lang); if (!Validate::isLoadedObject($lang) || !$lang->active || !$lang->isAssociatedToShop()) $cookie->id_lang = null; - } /* Automatically detect language if not already defined */ @@ -399,7 +397,7 @@ class ToolsCore { $context->cookie->id_lang = $id_lang; $language = new Language($id_lang); - if (Validate::isLoadedObject($language)) + if (Validate::isLoadedObject($language) && $language->active) $context->language = $language; $params = $_GET;