From 7c249478dcc568da671d2aae3147e2be0453e812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 16 Feb 2016 09:16:55 +0100 Subject: [PATCH] Remove check for libxml_disable_entity_loader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's there since PHP 5.2.11 and we require 5.5. Signed-off-by: Michal Čihař --- libraries/plugins/import/ImportOds.php | 9 --------- libraries/plugins/import/ImportXml.php | 9 --------- 2 files changed, 18 deletions(-) diff --git a/libraries/plugins/import/ImportOds.php b/libraries/plugins/import/ImportOds.php index 54062b5fb4..ee0bc5c3b9 100644 --- a/libraries/plugins/import/ImportOds.php +++ b/libraries/plugins/import/ImportOds.php @@ -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 * diff --git a/libraries/plugins/import/ImportXml.php b/libraries/plugins/import/ImportXml.php index a94ced485f..2bc90814d7 100644 --- a/libraries/plugins/import/ImportXml.php +++ b/libraries/plugins/import/ImportXml.php @@ -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 *