MC-18702: Error when viewing CMS page grid with restricted user account

dhorytskyi · dhorytskyi · commit 12d5837f0c59 · 2019-08-01T14:27:50.000-05:00
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
`@@ -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`