aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexis Degrugillier <github@ainw.org> 2014-02-24 18:57:45 -0500
committerGravatar Alexis Degrugillier <github@ainw.org> 2014-02-24 18:57:45 -0500
commit867069d099f39b0e5e122641d8b4f2ae096b6506 (patch)
tree3a2615c703e8f50e50ca994991f8a13464977378
parent166009f3623213249086038f7af72a76507f60dc (diff)
Show only unread when selecting unread
Before, when there was no unread articles, all articles where displayed. This behaviour was not the one intended. Now, when there is no unread articles, a message is displayed to alert that there is no article. See #428
-rwxr-xr-xapp/Controllers/indexController.php11
1 files changed, 0 insertions, 11 deletions
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 38f4c0e7c..04b26d686 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -111,9 +111,6 @@ class FreshRSS_index_Controller extends Minz_ActionController {
$hasUnread = true;
break;
}
- if (!$hasUnread) {
- $this->view->state = $state = 'all';
- }
}
$today = @strtotime('today');
@@ -127,14 +124,6 @@ class FreshRSS_index_Controller extends Minz_ActionController {
try {
$entries = $entryDAO->listWhere($getType, $getId, $state, $order, $nb + 1, $first, $filter, $date_min, $keepHistoryDefault);
- // Si on a récupéré aucun article "non lus"
- // on essaye de récupérer tous les articles
- if ($state === 'not_read' && empty($entries)) {
- Minz_Log::record ('Conflicting information about nbNotRead!', Minz_Log::DEBUG);
- $this->view->state = 'all';
- $entries = $entryDAO->listWhere($getType, $getId, 'all', $order, $nb, $first, $filter, $date_min, $keepHistoryDefault);
- }
-
if (count($entries) <= $nb) {
$this->view->nextId = '';
} else { //We have more elements for pagination