Merge pull request #305 from Prestaworks/patch-9

[-]BO: Fixes issue with logo name.
This commit is contained in:
Vincent Augagneur
2013-04-24 01:29:58 -07:00

View File

@@ -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 || Shop::isFeatureActive()==false)
$logo_name = $logo_prefix.$ext;
if ($field_name == 'PS_STORES_ICON')