Ignore null Store ID in isVisibleOnStore function

ihorvansach · ihorvansach · commit c1f9f2033581 · 2019-05-15T10:47:07.000+03:00
diff --git a/Model/Category.php b/Model/Category.php
@@ -395,7 +395,8 @@ public function getMetaDescription()
      */
     public function isVisibleOnStore($storeId)
     {
-        return $this->getIsActive() && array_intersect([0, $storeId], $this->getStoreIds());
+        return $this->getIsActive()
+            && (null === $storeId || array_intersect([0, $storeId], $this->getStoreIds()));
     }
 
     /**
diff --git a/Model/Post.php b/Model/Post.php
@@ -801,7 +801,7 @@ public function isVisibleOnStore($storeId)
     {
         return $this->getIsActive()
             && $this->getData('publish_time') <= $this->getResource()->getDate()->gmtDate()
-            && array_intersect([0, $storeId], $this->getStoreIds());
+            && (null === $storeId || array_intersect([0, $storeId], $this->getStoreIds()));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,8 @@ public function getMetaDescription()`
`395`	`395`	`*/`
`396`	`396`	`public function isVisibleOnStore($storeId)`
`397`	`397`	`{`
`398`		`- return $this->getIsActive() && array_intersect([0, $storeId], $this->getStoreIds());`
	`398`	`+ return $this->getIsActive()`
	`399`	`+ && (null === $storeId \|\| array_intersect([0, $storeId], $this->getStoreIds()));`
`399`	`400`	`}`
`400`	`401`
`401`	`402`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,7 @@ public function isVisibleOnStore($storeId)`
`801`	`801`	`{`
`802`	`802`	`return $this->getIsActive()`
`803`	`803`	`&& $this->getData('publish_time') <= $this->getResource()->getDate()->gmtDate()`
`804`		`- && array_intersect([0, $storeId], $this->getStoreIds());`
	`804`	`+ && (null === $storeId \|\| array_intersect([0, $storeId], $this->getStoreIds()));`
`805`	`805`	`}`
`806`	`806`
`807`	`807`	`/**`