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

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2016-02-16 19:30:52 +11:00
commit 5ee4695bbc
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -79,6 +79,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

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

@ -18,15 +18,6 @@ use PMA;
use PMA\libraries\plugins\ImportPlugin;
use SimpleXMLElement;
/**
* We need way to disable external XML entities processing.
*/
if (!function_exists('libxml_disable_entity_loader')) {
$GLOBALS['skip_import'] = true;
return;
}
/**
* Handles the import for the ODS format
*
@ -147,7 +138,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);

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

@ -15,15 +15,6 @@ use PMA;
use PMA\libraries\plugins\ImportPlugin;
use SimpleXMLElement;
/**
* We need way to disable external XML entities processing.
*/
if (!function_exists('libxml_disable_entity_loader')) {
$GLOBALS['skip_import'] = true;
return;
}
/**
* Handles the import for the XML format
*
@ -104,7 +95,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);