Skip to content

Update Merge.php #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Update Merge.php #265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/code/core/Mage/Core/Model/Layout/Merge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,9 @@ protected function _loadFileLayoutUpdatesXml()
$fileStr = str_replace($this->_subst['from'], $this->_subst['to'], $fileStr);
/** @var $fileXml Mage_Core_Model_Layout_Element */
$fileXml = simplexml_load_string($fileStr, $this->_elementClass);
$layoutStr .= $fileXml->innerXml();
if ($fileXml){
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check that the $fileXml actually exists and isn't a null object.

$layoutStr .= $fileXml->innerXml();
}
}
$layoutStr = '<layouts>' . $layoutStr . '</layouts>';
$layoutXml = simplexml_load_string($layoutStr, $this->_elementClass);
Expand Down