magento/magento2 — pull request #265 by mrploddy (2013-03-22 11:04:48+00:00)
Title: Update Merge.php

Hi there,

There is an issue with Module layout xml files being blank and the _loadFileLayoutUpdatesXML() function erroring out on line 642.

How to reproduce -
Create a new magento 2 module but create a new front end or admin layout xml file but make the file blank with nothing inside it. Try to load the front end and it will produce the message.

This could be an issue when uploads of modules fails eg partial FTP uploads and so on.

Fatal error: Call to a member function innerXml() on a non-object in /home/mage2craig/public_html/app/code/core/Mage/Core/Model/Layout/Merge.php on line 643

Proposed Fix -
Check for the existence of the object before actually trying to include it eg as per the following code snippet - lines 641 to 642

$fileXml = simplexml_load_string($fileStr, $this->_elementClass);
if ($fileXml) {
$layoutStr .= $fileXml->innerXml();
}

Regards

mrploddy