diff options
| author | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
|---|---|---|
| committer | Art4 <[email protected]> | 2015-02-19 23:17:43 +0100 |
| commit | d9c042c4c536f1afbf206aeea09b0b127b7b6418 (patch) | |
| tree | 9d7ef18c6d9d4c8f8f4d1c9a5dbfceeb9fd5acf4 /plugins/import_export/init.php | |
| parent | cf42b79120290ee5866136a0c4656e6999f06045 (diff) | |
| parent | 4ca621a36016de1fbb5447e1c1de0b607ba94a7c (diff) | |
Merge branch 'master' into patch-1
Conflicts:
locale/de_DE/LC_MESSAGES/messages.po
Diffstat (limited to 'plugins/import_export/init.php')
| -rw-r--r-- | plugins/import_export/init.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php index d185210ee..e61b62b67 100644 --- a/plugins/import_export/init.php +++ b/plugins/import_export/init.php @@ -189,6 +189,8 @@ class Import_Export extends Plugin implements IHandler { $num_processed = 0; $num_feeds_created = 0; + libxml_disable_entity_loader(false); + $doc = @DOMDocument::load($filename); if (!$doc) { @@ -206,6 +208,8 @@ class Import_Export extends Plugin implements IHandler { $doc = DOMDocument::loadXML($data); } + libxml_disable_entity_loader(true); + if ($doc) { $xpath = new DOMXpath($doc); |