From d1ee26895edeb8d6339e8962cab964a2c19f5a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 20 Mar 2013 15:26:51 +0100 Subject: [PATCH] // Bug fix, no language is set when a employee is not logged yet --- config/config.inc.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/config/config.inc.php b/config/config.inc.php index 4020e8d56c8b1..ce76ea8c6c5fb 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -151,19 +151,18 @@ if ($employee->id_profile != _PS_ADMIN_PROFILE_) Shop::cacheShops(true); - $language = new Language($employee->id_lang); - $context->language = $language; $cookie->id_lang = (int)$employee->id_lang; } -else -{ - /* if the language stored in the cookie is not available language, use default language */ - if (isset($cookie->id_lang) && $cookie->id_lang) - $language = new Language($cookie->id_lang); - if (!isset($language) || !Validate::isLoadedObject($language)) - $language = new Language(Configuration::get('PS_LANG_DEFAULT')); - $context->language = $language; +/* if the language stored in the cookie is not available language, use default language */ +if (isset($cookie->id_lang) && $cookie->id_lang) + $language = new Language($cookie->id_lang); +if (!isset($language) || !Validate::isLoadedObject($language)) + $language = new Language(Configuration::get('PS_LANG_DEFAULT')); +$context->language = $language; + +if (!defined('_PS_ADMIN_DIR_')) +{ if (isset($cookie->id_customer) && (int)$cookie->id_customer) { $customer = new Customer($cookie->id_customer);