summaryrefslogtreecommitdiff
path: root/app/Controllers/indexController.php
diff options
context:
space:
mode:
authorGravatar Alexis Degrugillier <github@ainw.org> 2014-04-13 07:28:41 -0400
committerGravatar Alexis Degrugillier <github@ainw.org> 2014-04-13 07:28:41 -0400
commit86066b1659e33eb5fdfbcae5fb7f0bd93604d442 (patch)
tree9df9b09b6beb785b9f126ac69ec4b0aa01e01f9c /app/Controllers/indexController.php
parentd25afa9def1b02b7989b12c861e33da5c90ccba1 (diff)
Add a new status for 'ALL'
I made the conversion in every file I can think of. It should not have any reference to the string 'all' for the state context
Diffstat (limited to 'app/Controllers/indexController.php')
-rwxr-xr-xapp/Controllers/indexController.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index 243d887ac..48471b480 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -85,7 +85,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
$state_param = Minz_Request::param ('state', null);
$filter = Minz_Request::param ('search', '');
if (!empty($filter)) {
- $state = 'all'; //Search always in read and unread articles
+ $state = FreshRSS_Configuration::STATE_ALL; //Search always in read and unread articles
}
$this->view->order = $order = Minz_Request::param ('order', $this->view->conf->sort_order);
$nb = Minz_Request::param ('nb', $this->view->conf->posts_per_page);
@@ -108,7 +108,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
break;
}
if (!$hasUnread && ($state_param === null)) {
- $this->view->state = $state = 'all';
+ $this->view->state = $state = FreshRSS_Configuration::STATE_ALL;
}
}
@@ -127,8 +127,8 @@ class FreshRSS_index_Controller extends Minz_ActionController {
// on essaye de récupérer tous les articles
if ($state === FreshRSS_Configuration::STATE_NOT_READ && empty($entries) && ($state_param === null)) {
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, true, $keepHistoryDefault);
+ $this->view->state = FreshRSS_Configuration::STATE_ALL;
+ $entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb, $first, $filter, $date_min, true, $keepHistoryDefault);
}
if (count($entries) <= $nb) {