Update dispatcher.php

make sure value only defined once Update Shop.php suggestions from pululuk Fix for issue 12412
PrestaShop · May 19, 2022 · 696aa6c · 696aa6c
1 parent f6736ee
commit 696aa6c
Show file tree

Hide file tree

Showing 2 changed files with 7 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_')) || 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');

diff --git a/webservice/dispatcher.php b/webservice/dispatcher.php
@@ -28,6 +28,10 @@
 
 ob_start();
 
+if (!defined('_PS_API_IN_USE_')) {
+    define('_PS_API_IN_USE_', true);
+}
+
 require_once dirname(__FILE__) . '/../config/config.inc.php';
 
 // Cart is needed for some requests