Merge pull request #305 from Prestaworks/patch-9

[-]BO: Fixes issue with logo name.
PrestaShop · Apr 24, 2013 · ec45ea7 · ec45ea7
2 parents 05fd9ae + 7f5a78a
commit ec45ea7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php
@@ -614,7 +614,7 @@ protected function updateLogo($field_name, $logo_prefix)
 
 			$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')