rssfuncs: fix warning when trying to update nonexisting feed

This commit is contained in:
Andrew Dolgov 2016-11-30 14:03:21 +03:00
parent 12ff230bc2
commit bfe1eb4e52
1 changed files with 7 additions and 6 deletions

View File

@ -311,6 +311,13 @@
$result = db_query("SELECT title FROM ttrss_feeds $result = db_query("SELECT title FROM ttrss_feeds
WHERE id = '$feed'"); WHERE id = '$feed'");
if (db_num_rows($result) == 0) {
_debug("feed $feed NOT FOUND/SKIPPED", $debug_enabled);
user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
return false;
}
$title = db_fetch_result($result, 0, "title"); $title = db_fetch_result($result, 0, "title");
// feed was batch-subscribed or something, we need to get basic info // feed was batch-subscribed or something, we need to get basic info
@ -327,12 +334,6 @@
feed_language feed_language
FROM ttrss_feeds WHERE id = '$feed'"); FROM ttrss_feeds WHERE id = '$feed'");
if (db_num_rows($result) == 0) {
_debug("feed $feed NOT FOUND/SKIPPED", $debug_enabled);
user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
return false;
}
$owner_uid = db_fetch_result($result, 0, "owner_uid"); $owner_uid = db_fetch_result($result, 0, "owner_uid");
$mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result, $mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result,
0, "mark_unread_on_update")); 0, "mark_unread_on_update"));