valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Only count updating (i.e. enabled) feeds when determining active feeds with errors.' (#96) from wn/tt-rss:feature/only-warn-for-updating-feeds into master 

Reviewed-on: https://dev.tt-rss.org/tt-rss/tt-rss/pulls/96
This commit is contained in:
fox 2022-12-22 00:13:04 +03:00
parent 423b26afc5 46e2635869
commit fb4bc2615e
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
classes/feeds.php
View File

@ -431,12 +431,11 @@ class Feeds extends Handler_Protected {
$reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
$sth->execute([$_SESSION['uid']]);
$row = $sth->fetch();
$num_errors = $row["num_errors"];
$num_errors = ORM::for_table('ttrss_feeds')
->where_not_equal('last_error', '')
->where('owner_uid', $_SESSION['uid'])
->where_gt('update_interval', 0)
->count('id');
if ($num_errors > 0) {
$reply['content'] .= "<br/>";
@ -585,12 +584,11 @@ class Feeds extends Handler_Protected {
$reply['headlines']['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
$sth->execute([$_SESSION['uid']]);
$row = $sth->fetch();
$num_errors = $row["num_errors"];
$num_errors = ORM::for_table('ttrss_feeds')
->where_not_equal('last_error', '')
->where('owner_uid', $_SESSION['uid'])
->where_gt('update_interval', 0)
->count('id');
if ($num_errors > 0) {
$reply['headlines']['content'] .= "<br/>";

1
classes/pref/feeds.php
View File

@ -1154,6 +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)
->find_array());
}