gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_5' into QA_4_6

Browse Source
This commit is contained in:
Michal Čihař 2016-02-16 09:00:41 +01:00
commit 9a590a0b76
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

2
libraries/plugins/import/ImportOds.php
View File

@ -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);

2
libraries/plugins/import/ImportXml.php
View File

@ -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);