aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/Models/Category.php4
-rw-r--r--app/layout/aside_feed.phtml2
-rw-r--r--app/views/index/global.phtml2
-rw-r--r--app/views/stats/idle.phtml2
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');
}