MAGETWO-82889: #8236 FIX CMS blocks #11802

dmanners · dmanners · commit f1f1683e474f · 2017-10-30T12:18:10.000-05:00
- Merge Pull Request #11802 from thiagolima-bm/magento2:ISSUE#8236 - Merged commits: 1. 47a0843 2. d3aa3f8
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block.php b/app/code/Magento/Cms/Model/ResourceModel/Block.php
@@ -183,10 +183,10 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
         $entityMetadata = $this->metadataPool->getMetadata(BlockInterface::class);
         $linkField = $entityMetadata->getLinkField();
 
-        if ($this->_storeManager->hasSingleStore()) {
+        if ($this->_storeManager->isSingleStoreMode()) {
             $stores = [Store::DEFAULT_STORE_ID];
         } else {
-            $stores = (array)$object->getData('stores');
+            $stores = (array)$object->getData('store_id');
         }
 
         $select = $this->getConnection()->select()
@@ -230,7 +230,7 @@ public function lookupStoreIds($id)
                 'cbs.' . $linkField . ' = cb.' . $linkField,
                 []
             )
-            ->where('cb.' . $entityMetadata->getIdentifierField()  . ' = :block_id');
+            ->where('cb.' . $entityMetadata->getIdentifierField() . ' = :block_id');
 
         return $connection->fetchCol($select, ['block_id' => (int)$id]);
     }

Original file line number	Diff line number	Diff line change
`@@ -183,10 +183,10 @@ public function getIsUniqueBlockToStores(AbstractModel $object)`
`183`	`183`	`$entityMetadata = $this->metadataPool->getMetadata(BlockInterface::class);`
`184`	`184`	`$linkField = $entityMetadata->getLinkField();`
`185`	`185`
`186`		`- if ($this->_storeManager->hasSingleStore()) {`
	`186`	`+ if ($this->_storeManager->isSingleStoreMode()) {`
`187`	`187`	`$stores = [Store::DEFAULT_STORE_ID];`
`188`	`188`	`} else {`
`189`		`- $stores = (array)$object->getData('stores');`
	`189`	`+ $stores = (array)$object->getData('store_id');`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`$select = $this->getConnection()->select()`
`@@ -230,7 +230,7 @@ public function lookupStoreIds($id)`
`230`	`230`	`'cbs.' . $linkField . ' = cb.' . $linkField,`
`231`	`231`	`[]`
`232`	`232`	`)`
`233`		`- ->where('cb.' . $entityMetadata->getIdentifierField() . ' = :block_id');`
	`233`	`+ ->where('cb.' . $entityMetadata->getIdentifierField() . ' = :block_id');`
`234`	`234`
`235`	`235`	`return $connection->fetchCol($select, ['block_id' => (int)$id]);`
`236`	`236`	`}`