Fix getting active feeds with errors.
fb4bc2615e
incorrectly excluded feeds using the default update interval. This change ignores the unlikely scenario where someone has the default update interval set to 'disabled'.
This commit is contained in:
parent
fb4bc2615e
commit
371af1a39c
|
@ -434,7 +434,7 @@ class Feeds extends Handler_Protected {
|
||||||
$num_errors = ORM::for_table('ttrss_feeds')
|
$num_errors = ORM::for_table('ttrss_feeds')
|
||||||
->where_not_equal('last_error', '')
|
->where_not_equal('last_error', '')
|
||||||
->where('owner_uid', $_SESSION['uid'])
|
->where('owner_uid', $_SESSION['uid'])
|
||||||
->where_gt('update_interval', 0)
|
->where_gte('update_interval', 0)
|
||||||
->count('id');
|
->count('id');
|
||||||
|
|
||||||
if ($num_errors > 0) {
|
if ($num_errors > 0) {
|
||||||
|
@ -587,7 +587,7 @@ class Feeds extends Handler_Protected {
|
||||||
$num_errors = ORM::for_table('ttrss_feeds')
|
$num_errors = ORM::for_table('ttrss_feeds')
|
||||||
->where_not_equal('last_error', '')
|
->where_not_equal('last_error', '')
|
||||||
->where('owner_uid', $_SESSION['uid'])
|
->where('owner_uid', $_SESSION['uid'])
|
||||||
->where_gt('update_interval', 0)
|
->where_gte('update_interval', 0)
|
||||||
->count('id');
|
->count('id');
|
||||||
|
|
||||||
if ($num_errors > 0) {
|
if ($num_errors > 0) {
|
||||||
|
|
|
@ -1154,7 +1154,7 @@ class Pref_Feeds extends Handler_Protected {
|
||||||
->select_many('id', 'title', 'feed_url', 'last_error', 'site_url')
|
->select_many('id', 'title', 'feed_url', 'last_error', 'site_url')
|
||||||
->where_not_equal('last_error', '')
|
->where_not_equal('last_error', '')
|
||||||
->where('owner_uid', $_SESSION['uid'])
|
->where('owner_uid', $_SESSION['uid'])
|
||||||
->where_gt('update_interval', 0)
|
->where_gte('update_interval', 0)
|
||||||
->find_array());
|
->find_array());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue