[-] FO : you cannot access the front office with a disabled language anymore #PSCFV-9714

This commit is contained in:
Damien Metzger
2013-07-09 10:59:25 +02:00
parent 00425a4c1a
commit bfa82c9648
+1 -3
View File
@@ -338,11 +338,9 @@ class ToolsCore
/* If language does not exist or is disabled, erase it */ /* If language does not exist or is disabled, erase it */
if ($cookie->id_lang) if ($cookie->id_lang)
{ {
//echo $cookie->id_lang;exit;
$lang = new Language((int)$cookie->id_lang); $lang = new Language((int)$cookie->id_lang);
if (!Validate::isLoadedObject($lang) || !$lang->active || !$lang->isAssociatedToShop()) if (!Validate::isLoadedObject($lang) || !$lang->active || !$lang->isAssociatedToShop())
$cookie->id_lang = null; $cookie->id_lang = null;
} }
/* Automatically detect language if not already defined */ /* Automatically detect language if not already defined */
@@ -399,7 +397,7 @@ class ToolsCore
{ {
$context->cookie->id_lang = $id_lang; $context->cookie->id_lang = $id_lang;
$language = new Language($id_lang); $language = new Language($id_lang);
if (Validate::isLoadedObject($language)) if (Validate::isLoadedObject($language) && $language->active)
$context->language = $language; $context->language = $language;
$params = $_GET; $params = $_GET;