Merge forwardport of #11410 to 2.3-develop branch

Applied pull request patch https://github.com/magento/magento2/pull/11410.patch (created by @crissanclick) based on commit(s): 1. 6862db0 2. 4c698c2 Fixed GitHub Issues in 2.3-develop branch: - #11365: "Ignore this notification" isn't working (reported by @sigismund)
magento · Jan 23, 2018 · 931133a · 931133a
2 parents 8e77e2f + ad6c0af
commit 931133a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
@@ -51,8 +51,8 @@ public function execute()
         }
 
         // clear the block html cache
-        $this->_cacheTypeList->cleanType('block_html');
-        $this->_eventManager->dispatch('adminhtml_cache_refresh_type', ['type' => 'block_html']);
+        $this->_cacheTypeList->cleanType('config');
+        $this->_eventManager->dispatch('adminhtml_cache_refresh_type', ['type' => 'config']);
 
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);

diff --git a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php
@@ -19,7 +19,7 @@ public function testExecute()
             ->getMock();
         $cacheTypeList->expects($this->once())
             ->method('cleanType')
-            ->with('block_html')
+            ->with('config')
             ->willReturn(null);
 
         $request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)