Skip to content

Commit

Permalink
Merge forwardport of #11240 to 2.3-develop branch
Browse files Browse the repository at this point in the history
Applied pull request patch https://github.com/magento/magento2/pull/11240.patch (created by @leptoquark1) based on commit(s):
  1. 16a8050
  2. 86032de
  • Loading branch information
magento-engcom-team authored Jan 23, 2018
2 parents 7898946 + 6d4f36d commit a173e1c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/View/Model/Layout/Merge.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit a173e1c

Please sign in to comment.