From: zaikos <no-reply@zaikos.com>
Date: Fri, 26 Dec 2014 19:43:38 +0000 (-0500)
Subject: Temporarily disable entity loader when importing XML file.
X-Git-Tag: 16.3~383^2~1^2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4262e0019a519b2db4d6507ff0f2984ac1c6249a;p=tt-rss.git

Temporarily disable entity loader when importing XML file.
---

diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php
index d185210e..e61b62b6 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);