Merge remote-tracking branch 'tango/MC-18702' into PR_2019_08_20

vkolesny · vkolesny · commit 3ad11582a72c · 2019-08-20T10:31:47.000-05:00
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php
@@ -74,7 +74,9 @@ public function addStoreFilter($store, $withAdmin = true)
     {
         if (!$this->getFlag('store_filter_added')) {
             $this->performAddStoreFilter($store, $withAdmin);
+            $this->setFlag('store_filter_added', true);
         }
+
         return $this;
     }
 
diff --git a/app/code/Magento/Cms/ViewModel/Page/Grid/UrlBuilder.php b/app/code/Magento/Cms/ViewModel/Page/Grid/UrlBuilder.php
@@ -103,7 +103,7 @@ private function prepareRequestQuery(string $store, string $href) : array
             StoreManagerInterface::PARAM_NAME => $store,
             ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlEncoder->encode($href)
         ];
-        if ($storeView->getCode() !== $store) {
+        if (null !== $storeView && $storeView->getCode() !== $store) {
             $query['___from_store'] = $storeView->getCode();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,9 @@ public function addStoreFilter($store, $withAdmin = true)`
`74`	`74`	`{`
`75`	`75`	`if (!$this->getFlag('store_filter_added')) {`
`76`	`76`	`$this->performAddStoreFilter($store, $withAdmin);`
	`77`	`+ $this->setFlag('store_filter_added', true);`
`77`	`78`	`}`
	`79`	`+`
`78`	`80`	`return $this;`
`79`	`81`	`}`
`80`	`82`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ private function prepareRequestQuery(string $store, string $href) : array`
`103`	`103`	`StoreManagerInterface::PARAM_NAME => $store,`
`104`	`104`	`ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlEncoder->encode($href)`
`105`	`105`	`];`
`106`		`- if ($storeView->getCode() !== $store) {`
	`106`	`+ if (null !== $storeView && $storeView->getCode() !== $store) {`
`107`	`107`	`$query['___from_store'] = $storeView->getCode();`
`108`	`108`	`}`
`109`	`109`