From 371af1a39cf7a68b1fc3f959ad0f28c3811915fa Mon Sep 17 00:00:00 2001 From: wn_ Date: Sat, 24 Dec 2022 21:22:16 +0000 Subject: [PATCH] Fix getting active feeds with errors. fb4bc2615e3910e8a7d15c6306e10247f7f80f4b incorrectly excluded feeds using the default update interval. This change ignores the unlikely scenario where someone has the default update interval set to 'disabled'. --- classes/feeds.php | 4 ++-- classes/pref/feeds.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/feeds.php b/classes/feeds.php index 3c21400f8..de2f750cd 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -434,7 +434,7 @@ class Feeds extends Handler_Protected { $num_errors = ORM::for_table('ttrss_feeds') ->where_not_equal('last_error', '') ->where('owner_uid', $_SESSION['uid']) - ->where_gt('update_interval', 0) + ->where_gte('update_interval', 0) ->count('id'); if ($num_errors > 0) { @@ -587,7 +587,7 @@ class Feeds extends Handler_Protected { $num_errors = ORM::for_table('ttrss_feeds') ->where_not_equal('last_error', '') ->where('owner_uid', $_SESSION['uid']) - ->where_gt('update_interval', 0) + ->where_gte('update_interval', 0) ->count('id'); if ($num_errors > 0) { diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 7853e7243..a91d4b1e3 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1154,7 +1154,7 @@ class Pref_Feeds extends Handler_Protected { ->select_many('id', 'title', 'feed_url', 'last_error', 'site_url') ->where_not_equal('last_error', '') ->where('owner_uid', $_SESSION['uid']) - ->where_gt('update_interval', 0) + ->where_gte('update_interval', 0) ->find_array()); }