@@ -126,16 +126,26 @@ protected function _prepareLayout()
126126 */
127127 protected function _addBreadcrumbs (\Magento \Cms \Model \Page $ page )
128128 {
129+ $ homePageIdentifier = $ this ->_scopeConfig ->getValue (
130+ 'web/default/cms_home_page ' ,
131+ ScopeInterface::SCOPE_STORE
132+ );
133+ $ homePageDelimiterPosition = strrpos ($ homePageIdentifier , '| ' );
134+ if ($ homePageDelimiterPosition ) {
135+ $ homePageIdentifier = substr ($ homePageIdentifier , 0 , $ homePageDelimiterPosition );
136+ }
137+ $ noRouteIdentifier = $ this ->_scopeConfig ->getValue (
138+ 'web/default/cms_no_route ' ,
139+ ScopeInterface::SCOPE_STORE
140+ );
141+ $ noRouteDelimiterPosition = strrpos ($ noRouteIdentifier , '| ' );
142+ if ($ noRouteDelimiterPosition ) {
143+ $ noRouteIdentifier = substr ($ noRouteIdentifier , 0 , $ noRouteDelimiterPosition );
144+ }
129145 if ($ this ->_scopeConfig ->getValue ('web/default/show_cms_breadcrumbs ' , ScopeInterface::SCOPE_STORE )
130146 && ($ breadcrumbsBlock = $ this ->getLayout ()->getBlock ('breadcrumbs ' ))
131- && $ page ->getIdentifier () !== $ this ->_scopeConfig ->getValue (
132- 'web/default/cms_home_page ' ,
133- ScopeInterface::SCOPE_STORE
134- )
135- && $ page ->getIdentifier () !== $ this ->_scopeConfig ->getValue (
136- 'web/default/cms_no_route ' ,
137- ScopeInterface::SCOPE_STORE
138- )
147+ && $ page ->getIdentifier () !== $ homePageIdentifier
148+ && $ page ->getIdentifier () !== $ noRouteIdentifier
139149 ) {
140150 $ breadcrumbsBlock ->addCrumb (
141151 'home ' ,
0 commit comments