Merge branch 'bugfix/invalid-opml' of wn/tt-rss into master

4 years ago · 68b78ecd3d
parent b6372a846d 614d3ac1bf
commit 68b78ecd3d
1 changed files with 2 additions and 2 deletions
--- a/classes/opml.php
+++ b/classes/opml.php
@ -606,7 +606,7 @@ class Opml extends Handler_Protected {
 		if (is_file($tmp_file)) {
 			$doc = new DOMDocument();
 			libxml_disable_entity_loader(false);
-			$doc->load($tmp_file);
+			$loaded = $doc->load($tmp_file);
 			libxml_disable_entity_loader(true);
 			unlink($tmp_file);
 		} else if (!$doc) {
@ -614,7 +614,7 @@ class Opml extends Handler_Protected {
 			return;
 		}

-		if ($doc) {
+		if ($loaded) {
 			$this->pdo->beginTransaction();
 			$this->opml_import_category($doc, false, $owner_uid, false);
 			$this->pdo->commit();