Update Merge.php #265
Closed
Update Merge.php #265
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Check that the $fileXml actually exists and isn't a null object.
|
Hello mrploddy, |
magento-team
added a commit
that referenced
this pull request
Nov 29, 2013
* Modularity improvements:
* Breakdown of the Adminhtml module:
* Moved Newsletter, Report logic to the respective modules
* Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules
* Removed application dependencies from the library
* Move Magento\Core common blocks in the library
* Application areas rework:
* Areas are independent from Store
* Removed deprecated annotation from the getArea methods
* GitHub requests:
* [#245](#245) -- Resolve design flaws in core URL helper
* [#247](#247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage
* [#259](#259) -- Turkish Lira (TRY) is supported for Turkish members.
* [#262](#262) -- Update Rule.php
* [#373](#373) -- [Magento/Sales] Fixed typos
* [#382](#382) -- [Magento/Core] Fixed typos
* [#304](#304) -- Removed Erroneous closing "
* [#323](#323) -- InstanceController.php - made setBody protected
* [#349](#349) -- Move Mage_Catalog menu declaration into Mage_Catalog module.
* [#265](#265) -- Update Merge.php
* [#271](#271) -- Check Data should validate gallery information
* [#305](#305) -- Extra ", tidied up nested quotes
* [#352](#352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration
* [#224](#224) -- Tax formatting is locale aware and should not
* [#338](#338) -- Correcting SQL for required_options column
* [#327](#327) -- cart api bug fix & partial invoice credit memo divide by zero warning
* Themes update:
* Old frontend (magento_demo) and backend (magento_basic) themes are removed
* Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules
* Fixed bugs:
* Fixed the error when Magento cannot be reinstalled to the same database with table prefix
* Fixed report Products in Cart
* Fixed error on attempt to insert image to CMS pages under version control
* Fixed order status grid so that you can assign state, edit, and view custom order status
* Fixed Related Products Rule page so that category can be selected on conditions tab
* Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled
* Fixed the bug with international DHL quotes
|
Hello mrploddy, |
vpelipenko
added a commit
that referenced
this pull request
May 8, 2015
[Firedrakes] MAGETWO-33528: M2 GitHub Update (version 0.74.0-beta7)
magento-team
pushed a commit
that referenced
this pull request
Dec 23, 2015
[Ogres] Bug fixes and custom vendor part 1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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