Fixed #26118

Shikha Mishra · web-flow · commit fdc62e61a578 · 2020-04-25T22:37:23.000+05:30
Fixed #26118 cmsBlocks that has scope limited to specific Store View can be seen on other Store Views in case there are Blocks with identical identifiers on both Store Views
diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php
@@ -133,6 +133,7 @@ public function save(Data\BlockInterface $block)
     public function getById($blockId)
     {
         $block = $this->blockFactory->create();
+        $block->setStoreId($this->storeManager->getStore()->getId());
         $this->resource->load($block, $blockId);
         if (!$block->getId()) {
             throw new NoSuchEntityException(__('The CMS block with the "%1" ID doesn\'t exist.', $blockId));

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ public function save(Data\BlockInterface $block)`
`133`	`133`	`public function getById($blockId)`
`134`	`134`	`{`
`135`	`135`	`$block = $this->blockFactory->create();`
	`136`	`+ $block->setStoreId($this->storeManager->getStore()->getId());`
`136`	`137`	`$this->resource->load($block, $blockId);`
`137`	`138`	`if (!$block->getId()) {`
`138`	`139`	`throw new NoSuchEntityException(__('The CMS block with the "%1" ID doesn\'t exist.', $blockId));`