Merge remote-tracking branch 'origin/AC-3167' into Hammer_Community_Backlog_21092022

glo71317 · glo71317 · commit cce3a042983a · 2022-09-21T12:51:27.000+05:30
diff --git a/app/code/Magento/Cms/Block/Page.php b/app/code/Magento/Cms/Block/Page.php
@@ -135,7 +135,7 @@ protected function _addBreadcrumbs(\Magento\Cms\Model\Page $page)
             'web/default/cms_no_route',
             ScopeInterface::SCOPE_STORE
         );
-        $noRouteDelimiterPosition = strrpos($noRouteIdentifier, '|');
+        $noRouteDelimiterPosition = $noRouteIdentifier === null ? false : strrpos($noRouteIdentifier, '|');
         if ($noRouteDelimiterPosition) {
             $noRouteIdentifier = substr($noRouteIdentifier, 0, $noRouteDelimiterPosition);
         }

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ protected function _addBreadcrumbs(\Magento\Cms\Model\Page $page)`
`135`	`135`	`'web/default/cms_no_route',`
`136`	`136`	`ScopeInterface::SCOPE_STORE`
`137`	`137`	`);`
`138`		`- $noRouteDelimiterPosition = strrpos($noRouteIdentifier, '\|');`
	`138`	`+ $noRouteDelimiterPosition = $noRouteIdentifier === null ? false : strrpos($noRouteIdentifier, '\|');`
`139`	`139`	`if ($noRouteDelimiterPosition) {`
`140`	`140`	`$noRouteIdentifier = substr($noRouteIdentifier, 0, $noRouteDelimiterPosition);`
`141`	`141`	`}`