From 04e021477611c58add18293b27f231252f408f0b Mon Sep 17 00:00:00 2001 From: mMarinetti Date: Thu, 27 Oct 2011 14:47:02 +0000 Subject: [PATCH] // fix when multishop is not activated git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9681 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/AdminController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/classes/AdminController.php b/classes/AdminController.php index 485c604e7..ee2e51446 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -888,8 +888,6 @@ class AdminControllerCore extends Controller ''.Context::getContext()->shop->name.'' ); } - else - $shop_name = Configuration::get('PS_SHOP_NAME'); // Multishop $is_multishop = Shop::isFeatureActive();// && Context::shop() != Shop::CONTEXT_ALL; @@ -985,7 +983,7 @@ class AdminControllerCore extends Controller 'lang_iso' => $this->context->language->iso_code, 'link' => $this->context->link, 'bo_color' => isset($this->context->employee->bo_color) ? Tools::htmlentitiesUTF8($this->context->employee->bo_color) : null, - 'shop_name' => $shop_name, + 'shop_name' => Configuration::get('PS_SHOP_NAME'), 'show_new_orders' => Configuration::get('PS_SHOW_NEW_ORDERS'), 'show_new_customers' => Configuration::get('PS_SHOW_NEW_CUSTOMERS'), 'show_new_messages' => Configuration::get('PS_SHOW_NEW_MESSAGES'),