⏫ Forwardport of #11240 to 2.3-develop branch

magento-engcom-team · magento-engcom-team · commit 6d4f36db79a9 · 2018-01-23T10:54:08.000-06:00
Applied pull request patch https://github.com/magento/magento2/pull/11240.patch (created by @leptoquark1) based on commit(s): 1. 16a8050 2. 86032de
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
@@ -811,7 +811,7 @@ private function getXmlErrors($libXmlErrors)
     protected function _getPhysicalTheme(\Magento\Framework\View\Design\ThemeInterface $theme)
     {
         $result = $theme;
-        while ($result->getId() && !$result->isPhysical()) {
+        while ($result !== null && $result->getId() && !$result->isPhysical()) {
             $result = $result->getParentTheme();
         }
         if (!$result) {

Original file line number	Diff line number	Diff line change
`@@ -811,7 +811,7 @@ private function getXmlErrors($libXmlErrors)`
`811`	`811`	`protected function _getPhysicalTheme(\Magento\Framework\View\Design\ThemeInterface $theme)`
`812`	`812`	`{`
`813`	`813`	`$result = $theme;`
`814`		`- while ($result->getId() && !$result->isPhysical()) {`
	`814`	`+ while ($result !== null && $result->getId() && !$result->isPhysical()) {`
`815`	`815`	`$result = $result->getParentTheme();`
`816`	`816`	`}`
`817`	`817`	`if (!$result) {`