ENGCOM-3833: 2.2 develop pr port 18888 #20183

magento-engcom-team · magento-engcom-team · commit 73f43d740005 · 2019-01-11T07:50:26.000-06:00
- Merge Pull Request #20183 from saphaljha/magento2:2.2-develop-PR-port-18888 - Merged commits: 1. 06443f9 2. cb6ff7e 3. 56a0f11 4. 9c59356 5. fd4dd39 6. a26b9bd 7. 30a6d5a
diff --git a/app/code/Magento/Review/Model/ResourceModel/Rating.php b/app/code/Magento/Review/Model/ResourceModel/Rating.php
@@ -425,9 +425,11 @@ public function getReviewSummary($object, $onlyForCurrentStore = true)
 
         $data = $connection->fetchAll($select, [':review_id' => $object->getReviewId()]);
 
+        $currentStore = $this->_storeManager->isSingleStoreMode() ? $this->_storeManager->getStore()->getId() : null;
+
         if ($onlyForCurrentStore) {
             foreach ($data as $row) {
-                if ($row['store_id'] == $this->_storeManager->getStore()->getId()) {
+                if ($row['store_id'] !== $currentStore) {
                     $object->addData($row);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -425,9 +425,11 @@ public function getReviewSummary($object, $onlyForCurrentStore = true)`
`425`	`425`
`426`	`426`	`$data = $connection->fetchAll($select, [':review_id' => $object->getReviewId()]);`
`427`	`427`
	`428`	`+ $currentStore = $this->_storeManager->isSingleStoreMode() ? $this->_storeManager->getStore()->getId() : null;`
	`429`	`+`
`428`	`430`	`if ($onlyForCurrentStore) {`
`429`	`431`	`foreach ($data as $row) {`
`430`		`- if ($row['store_id'] == $this->_storeManager->getStore()->getId()) {`
	`432`	`+ if ($row['store_id'] !== $currentStore) {`
`431`	`433`	`$object->addData($row);`
`432`	`434`	`}`
`433`	`435`	`}`