dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix when multishop is not activated

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9681 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti committed 2011-10-27 14:47:02 +00:00
1 parent 7bfbfe0123
commit 04e0214776
1 file changed
+1 -3
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+1 -3
View File
@@ -888,8 +888,6 @@ class AdminControllerCore extends Controller
'<b>'.Context::getContext()->shop->name.'</b>' '<b>'.Context::getContext()->shop->name.'</b>'
); );
} }
else
$shop_name = Configuration::get('PS_SHOP_NAME');
// Multishop // Multishop
$is_multishop = Shop::isFeatureActive();// && Context::shop() != Shop::CONTEXT_ALL; $is_multishop = Shop::isFeatureActive();// && Context::shop() != Shop::CONTEXT_ALL;
@@ -985,7 +983,7 @@ class AdminControllerCore extends Controller
'lang_iso' => $this->context->language->iso_code, 'lang_iso' => $this->context->language->iso_code,
'link' => $this->context->link, 'link' => $this->context->link,
'bo_color' => isset($this->context->employee->bo_color) ? Tools::htmlentitiesUTF8($this->context->employee->bo_color) : null, '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_orders' => Configuration::get('PS_SHOW_NEW_ORDERS'),
'show_new_customers' => Configuration::get('PS_SHOW_NEW_CUSTOMERS'), 'show_new_customers' => Configuration::get('PS_SHOW_NEW_CUSTOMERS'),
'show_new_messages' => Configuration::get('PS_SHOW_NEW_MESSAGES'), 'show_new_messages' => Configuration::get('PS_SHOW_NEW_MESSAGES'),