Merge pull request 'Fix getting active feeds with errors.' (#97) from wn/tt-rss:bugfix/feeds-with-errors-default-interval into master
Reviewed-on: https://dev.tt-rss.org/tt-rss/tt-rss/pulls/97
This commit is contained in:
commit
22f8a22748
|
@ -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