FreshRSS
/
FreshRSS
mirror of https://github.com/FreshRSS/FreshRSS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No warning for muted feeds (#6114) 

* No warning for muted feeds
fix https://github.com/FreshRSS/FreshRSS/issues/6113

* Revert subscription
This commit is contained in:
Alexandre Alapetite 2024-02-21 09:46:47 +01:00 committed by GitHub
parent 7d6a64a522
commit 3eb3574b13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Category.php
View File

@ -40,7 +40,7 @@ class FreshRSS_Category extends Minz_Model {
$feed->_category($this);
$this->nbFeeds++;
$this->nbNotRead += $feed->nbNotRead();
$this->hasFeedsWithError |= $feed->inError();
$this->hasFeedsWithError |= ($feed->inError() && !$feed->mute());
}
}
}
@ -108,7 +108,7 @@ class FreshRSS_Category extends Minz_Model {
foreach ($this->feeds as $feed) {
$this->nbFeeds++;
$this->nbNotRead += $feed->nbNotRead();
$this->hasFeedsWithError |= $feed->inError();
$this->hasFeedsWithError |= ($feed->inError() && !$feed->mute());
}
$this->sortFeeds();

2
app/layout/aside_feed.phtml
View File

@ -109,7 +109,7 @@
$error_class = '';
$error_title = '';
if ($feed->inError()) {
if ($feed->inError() && !$feed->mute()) {
$error_class = ' error';
$error_title = _t('sub.feed.error');
}

2
app/views/index/global.phtml
View File

@ -45,7 +45,7 @@
$error_class = '';
$error_title = '';
if ($feed->inError()) {
if ($feed->inError() && !$feed->mute()) {
$error_class = ' error';
$error_title = _t('sub.feed.error');
}

2
app/views/stats/idle.phtml
View File

@ -29,7 +29,7 @@
$error_class = '';
$error_title = '';
if ($feed == null || $feed->inError()) {
if ($feed === null || $feed->inError()) {
$error_class = ' error';
$error_title = _t('sub.feed.error');
}