From dfab3014ead633a34377042bcf6bd4cd98617c83 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 6 Mar 2013 08:51:33 +0100 Subject: [PATCH 1/2] [-]BO: Fixes issue with logo name. Upgraded shops sometimes gets a -1 on the logo filename even if the multishop feature is turned off. Causing the BO and FO to link to the wrong file. --- controllers/admin/AdminThemesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index e0562d4cd..876ac9e3d 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -614,7 +614,7 @@ class AdminThemesControllerCore extends AdminController $ext = ($field_name == 'PS_STORES_ICON') ? '.gif' : '.jpg'; $logo_name = $logo_prefix.'-'.(int)$id_shop.$ext; - if (Context::getContext()->shop->getContext() == Shop::CONTEXT_ALL || $id_shop == 0) + if (Context::getContext()->shop->getContext() == Shop::CONTEXT_ALL || $id_shop == 0 || (bool)Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE')==false) $logo_name = $logo_prefix.$ext; if ($field_name == 'PS_STORES_ICON') From 7f5a78a120aa9e77c4be1122d80459baa5e1f602 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 12 Apr 2013 18:51:50 +0800 Subject: [PATCH 2/2] Update AdminThemesController.php --- controllers/admin/AdminThemesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 876ac9e3d..eadcea7b4 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -614,7 +614,7 @@ class AdminThemesControllerCore extends AdminController $ext = ($field_name == 'PS_STORES_ICON') ? '.gif' : '.jpg'; $logo_name = $logo_prefix.'-'.(int)$id_shop.$ext; - if (Context::getContext()->shop->getContext() == Shop::CONTEXT_ALL || $id_shop == 0 || (bool)Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE')==false) + if (Context::getContext()->shop->getContext() == Shop::CONTEXT_ALL || $id_shop == 0 || Shop::isFeatureActive()==false) $logo_name = $logo_prefix.$ext; if ($field_name == 'PS_STORES_ICON')