Merge branch 'MAINT_3_4_7' into QA_3_4

libraries/import/ods.php

@@ -13,6 +13,13 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+/**
+ * We need way to disable external XML entities processing.
+ */
+if (!function_exists('libxml_disable_entity_loader')) {
+    return;
+}
+
 /**
  * The possible scopes for $plugin_param are: 'table', 'database', and 'server'
  */
@@ -60,6 +67,11 @@ while (! ($finished && $i >= $len) && ! $error && ! $timeout_passed) {
 
 unset($data);
 
+/**
+ * Disable loading of external XML entities.
+ */
+libxml_disable_entity_loader();
+
 /**
  * Load the XML string
  *