From cabe45f5a44bec8b91f7cee463db4899555ac771 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 12 Dec 2020 17:24:56 +0100 Subject: [PATCH] Fix #16490 - [PHP 8.0] Function libxml_disable_entity_loader() is deprecated Cherry-pick: 723c0095b9393588c93fd96aaa8d5c0c6fad1b17 Signed-off-by: William Desportes --- libraries/classes/Plugins/Import/ImportOds.php | 6 ++++-- libraries/classes/Plugins/Import/ImportXml.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libraries/classes/Plugins/Import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php index 8e68692f9a..86606b8b39 100644 --- a/libraries/classes/Plugins/Import/ImportOds.php +++ b/libraries/classes/Plugins/Import/ImportOds.php @@ -131,9 +131,11 @@ class ImportOds extends ImportPlugin unset($data); /** - * Disable loading of external XML entities. + * Disable loading of external XML entities for PHP versions below 8.0. */ - libxml_disable_entity_loader(); + if (PHP_VERSION_ID < 80000) { + libxml_disable_entity_loader(); + } /** * Load the XML string diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php index 833d4e41ea..63774def97 100644 --- a/libraries/classes/Plugins/Import/ImportXml.php +++ b/libraries/classes/Plugins/Import/ImportXml.php @@ -88,9 +88,11 @@ class ImportXml extends ImportPlugin unset($data); /** - * Disable loading of external XML entities. + * Disable loading of external XML entities for PHP versions below 8.0. */ - libxml_disable_entity_loader(); + if (PHP_VERSION_ID < 80000) { + libxml_disable_entity_loader(); + } /** * Load the XML string