ENGCOM-4745: #22299: Cms block cache key does not contain the store id #22302

sivaschenko · web-flow · commit 1f818ef1fac8 · 2019-04-28T19:38:01.000+01:00
diff --git a/app/code/Magento/Cms/Block/Block.php b/app/code/Magento/Cms/Block/Block.php
@@ -84,4 +84,14 @@ public function getIdentities()
     {
         return [\Magento\Cms\Model\Block::CACHE_TAG . '_' . $this->getBlockId()];
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCacheKeyInfo()
+    {
+        $cacheKeyInfo = parent::getCacheKeyInfo();
+        $cacheKeyInfo[] = $this->_storeManager->getStore()->getId();
+        return $cacheKeyInfo;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,4 +84,14 @@ public function getIdentities()`
`84`	`84`	`{`
`85`	`85`	`return [\Magento\Cms\Model\Block::CACHE_TAG . '_' . $this->getBlockId()];`
`86`	`86`	`}`
	`87`	`+`
	`88`	`+ /**`
	`89`	`+ * @inheritdoc`
	`90`	`+ */`
	`91`	`+ public function getCacheKeyInfo()`
	`92`	`+ {`
	`93`	`+ $cacheKeyInfo = parent::getCacheKeyInfo();`
	`94`	`+ $cacheKeyInfo[] = $this->_storeManager->getStore()->getId();`
	`95`	`+ return $cacheKeyInfo;`
	`96`	`+ }`
`87`	`97`	`}`