summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-01-15 10:37:42 +0300
committerAndrew Dolgov <[email protected]>2015-01-15 10:37:42 +0300
commitd87b710d84462f5aac607aa0f3fc75b28477890e (patch)
tree528164514526c9413180baf3a18a21392bfe07e5 /plugins
parentb1bb951fb81d084429539c9d5b216dead56c9bd7 (diff)
parent7871ed81b701bd18a58bd1442a59d88697b73e82 (diff)
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Diffstat (limited to 'plugins')
-rw-r--r--plugins/import_export/init.php4
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);