blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

treat OPML-imported feeds without a title the same as a batch import

Browse source
This commit is contained in:
Tianon Gravi 2017-12-29 15:26:34 -08:00
parent bb0a8e323e
commit bbc4d4bf34
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
classes/opml.php
View file

@ -289,14 +289,16 @@ class Opml extends Handler_Protected {
$site_url = mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250); $site_url = mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250);
if ($feed_url && $feed_title) { if ($feed_url) {
$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
feed_url = ? AND owner_uid = ?"); feed_url = ? AND owner_uid = ?");
$sth->execute([$feed_url, $owner_uid]); $sth->execute([$feed_url, $owner_uid]);
if (!$feed_title) $feed_title = '[Unknown]';
if (!$sth->fetch()) { if (!$sth->fetch()) {
#$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id"); #$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
$this->opml_notice(T_sprintf("Adding feed: %s", $feed_title)); $this->opml_notice(T_sprintf("Adding feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
if (!$cat_id) $cat_id = null; if (!$cat_id) $cat_id = null;
@ -307,7 +309,7 @@ class Opml extends Handler_Protected {
$sth->execute([$feed_title, $feed_url, $owner_uid, $cat_id, $site_url]); $sth->execute([$feed_title, $feed_url, $owner_uid, $cat_id, $site_url]);
} else { } else {
$this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title)); $this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
} }
} }
} }