MAGETWO-81990: Virtual Theme load: Check for null to actually reach the code that handles this case to t… #11240

Oleksii Korshenko · web-flow · commit 776060fb5fb2 · 2017-10-16T16:47:54.000-04:00
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
@@ -799,7 +799,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
`@@ -799,7 +799,7 @@ private function getXmlErrors($libXmlErrors)`
`799`	`799`	`protected function _getPhysicalTheme(\Magento\Framework\View\Design\ThemeInterface $theme)`
`800`	`800`	`{`
`801`	`801`	`$result = $theme;`
`802`		`- while ($result->getId() && !$result->isPhysical()) {`
	`802`	`+ while ($result !== null && $result->getId() && !$result->isPhysical()) {`
`803`	`803`	`$result = $result->getParentTheme();`
`804`	`804`	`}`
`805`	`805`	`if (!$result) {`