4
0
Эх сурвалжийг харах

No warning for muted feeds (#6114)

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

* Revert subscription
Alexandre Alapetite 2 жил өмнө
parent
commit
3eb3574b13

+ 2 - 2
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();

+ 1 - 1
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');
 		}

+ 1 - 1
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');
 					}

+ 1 - 1
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');
 						}