Update Shop.php

suggestions from pululuk
PrestaShop · May 19, 2022 · 64194f3 · 64194f3
1 parent e726bd7
commit 64194f3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
@@ -396,7 +396,9 @@ public static function initialize()
             Configuration::getMultiShopValues('PS_MEDIA_SERVER_3')
         );
 
-        if ((!$id_shop && defined('_PS_ADMIN_DIR_')) || ('all' === $id_shop && defined('_PS_API_IN_USE_') && _PS_API_IN_USE_) || Tools::isPHPCLI() || in_array($http_host, $all_media)) {
+        $isAllShop = 'all' === $id_shop;
+        $isApiInUse = defined('_PS_API_IN_USE_') && _PS_API_IN_USE_;
+        if ((!$id_shop && defined('_PS_ADMIN_DIR_')) || ($isAllShop && $isApiInUse) || Tools::isPHPCLI() || in_array($http_host, $all_media)) {
             // If in admin, we can access to the shop without right URL
             if ((!$id_shop && Tools::isPHPCLI()) || defined('_PS_ADMIN_DIR_')) {
                 $id_shop = (int) Configuration::get('PS_SHOP_DEFAULT');