servers
/
ttrss
mirror of https://tt-rss.org/git/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
fox 2020-07-01 14:48:02 +00:00 committed by Gogs
parent b6372a846d 614d3ac1bf
commit 68b78ecd3d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/opml.php
View File

@ -606,7 +606,7 @@ class Opml extends Handler_Protected {
if (is_file($tmp_file)) { if (is_file($tmp_file)) {
$doc = new DOMDocument(); $doc = new DOMDocument();
libxml_disable_entity_loader(false); libxml_disable_entity_loader(false);
$doc->load($tmp_file); $loaded = $doc->load($tmp_file);
libxml_disable_entity_loader(true); libxml_disable_entity_loader(true);
unlink($tmp_file); unlink($tmp_file);
} else if (!$doc) { } else if (!$doc) {
@ -614,7 +614,7 @@ class Opml extends Handler_Protected {
return; return;
} }
if ($doc) { if ($loaded) {
$this->pdo->beginTransaction(); $this->pdo->beginTransaction();
$this->opml_import_category($doc, false, $owner_uid, false); $this->opml_import_category($doc, false, $owner_uid, false);
$this->pdo->commit(); $this->pdo->commit();