diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2024-02-21 09:46:47 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-02-21 09:46:47 +0100 |
| commit | 3eb3574b1328a4172142a50b2a344413b7910d44 (patch) | |
| tree | 44c07ca7acb8bcbb5d156e787d3b6a530673b03c | |
| parent | 7d6a64a52243838e37ed47289b73574cfcd3b356 (diff) | |
No warning for muted feeds (#6114)
* No warning for muted feeds
fix https://github.com/FreshRSS/FreshRSS/issues/6113
* Revert subscription
| -rw-r--r-- | app/Models/Category.php | 4 | ||||
| -rw-r--r-- | app/layout/aside_feed.phtml | 2 | ||||
| -rw-r--r-- | app/views/index/global.phtml | 2 | ||||
| -rw-r--r-- | app/views/stats/idle.phtml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/Models/Category.php b/app/Models/Category.php index 230431311..1f5b4dc61 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -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(); diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 8dca19b41..304c10d04 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -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'); } diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml index 6a46ec2ca..011b66a49 100644 --- a/app/views/index/global.phtml +++ b/app/views/index/global.phtml @@ -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'); } diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml index 5390a00a3..c5f9a1e6b 100644 --- a/app/views/stats/idle.phtml +++ b/app/views/stats/idle.phtml @@ -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'); } |