Merge remote-tracking branch 'origin/MC-29988' into 2.4-develop-pr8

Author: serhii-balko

app/code/Magento/Wishlist/Controller/Index/Plugin.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Wishlist plugin before dispatch
@@ -89,7 +90,7 @@ public function beforeDispatch(\Magento\Framework\App\ActionInterface $subject,
                 $this->messageManager->addErrorMessage(__('You must login or register to add items to your wishlist.'));
             }
         }
-        if (!$this->config->isSetFlag('wishlist/general/active')) {
+        if (!$this->config->isSetFlag('wishlist/general/active', ScopeInterface::SCOPE_STORES)) {
             throw new NotFoundException(__('Page not found.'));
         }
     }

app/code/Magento/Wishlist/Test/Unit/Controller/Index/PluginTest.php

@@ -6,8 +6,12 @@
 
 namespace Magento\Wishlist\Test\Unit\Controller\Index;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * Test for wishlist plugin before dispatch
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PluginTest extends \PHPUnit\Framework\TestCase
 {
@@ -175,7 +179,7 @@ public function testBeforeDispatch()
         $this->config
             ->expects($this->once())
             ->method('isSetFlag')
-            ->with('wishlist/general/active')
+            ->with('wishlist/general/active', ScopeInterface::SCOPE_STORES)
             ->willReturn(false);
 
         $this->getPlugin()->beforeDispatch($indexController, $this->request);