undo of fix #382: XXE DoS in engelsystem - the feature is actually needed for xcal files

7 years ago · 952dc6921a
parent c70e268a2e
commit 952dc6921a
1 changed files with 0 additions and 2 deletions
--- a/includes/pages/admin_import.php
+++ b/includes/pages/admin_import.php
@ -80,7 +80,6 @@ function admin_import()
                if (isset($_FILES['xcal_file']) && ($_FILES['xcal_file']['error'] == 0)) {
                    if (move_uploaded_file($_FILES['xcal_file']['tmp_name'], $import_file)) {
                        libxml_use_internal_errors(true);
-                        libxml_disable_entity_loader(true);
                        if (simplexml_load_file($import_file) === false) {
                            $valid = false;
                            error(_('No valid xml/xcal file provided.'));
@ -425,7 +424,6 @@ function read_xml($file)
    global $xml_import;
    if (!isset($xml_import)) {
        libxml_use_internal_errors(true);
-        libxml_disable_entity_loader(true);
        $xml_import = simplexml_load_file($file);
    }
    return $xml_import;