diff --git a/ChangeLog b/ChangeLog index 5ab578cd29..3d75d2ea29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,7 @@ phpMyAdmin - ChangeLog - issue Field names and aliases are being correctly parsed now. - issue #11959 Fix javascript error in setup - issue #11964 Undefined index: TABLE_COMMENT in database structure page +- issue #11967 Fix PHP error on loading invalid XML or ODS file 4.5.4.1 (2016-01-29) - issue #11892 Error with PMA 4.4.15.3 diff --git a/libraries/plugins/import/ImportOds.php b/libraries/plugins/import/ImportOds.php index 6111b6fb6a..54062b5fb4 100644 --- a/libraries/plugins/import/ImportOds.php +++ b/libraries/plugins/import/ImportOds.php @@ -147,7 +147,7 @@ class ImportOds extends ImportPlugin * result in increased performance without the need to * alter the code in any way. It's basically a freebee. */ - $xml = simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT); + $xml = @simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT); unset($buffer); diff --git a/libraries/plugins/import/ImportXml.php b/libraries/plugins/import/ImportXml.php index bc433c6182..a94ced485f 100644 --- a/libraries/plugins/import/ImportXml.php +++ b/libraries/plugins/import/ImportXml.php @@ -104,7 +104,7 @@ class ImportXml extends ImportPlugin * result in increased performance without the need to * alter the code in any way. It's basically a freebee. */ - $xml = simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT); + $xml = @simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT); unset($buffer);