// Bug fix, no language is set when a employee is not logged yet

PrestaShop · Mar 20, 2013 · d1ee268 · d1ee268
1 parent 3b97989
commit d1ee268
Showing 1 changed file with 9 additions and 10 deletions.
diff --git 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);