|
|
@@ -76,14 +76,14 @@ class FreshRSS_index_Controller extends Minz_ActionController {
|
|
|
);
|
|
|
|
|
|
// On récupère les différents éléments de filtrage
|
|
|
- $this->view->state = $state = Minz_Request::param ('state', $this->view->conf->default_view);
|
|
|
+ $this->view->state = Minz_Request::param('state', $this->view->conf->default_view);
|
|
|
$state_param = Minz_Request::param ('state', null);
|
|
|
$filter = Minz_Request::param ('search', '');
|
|
|
$this->view->order = $order = Minz_Request::param ('order', $this->view->conf->sort_order);
|
|
|
$nb = Minz_Request::param ('nb', $this->view->conf->posts_per_page);
|
|
|
$first = Minz_Request::param ('next', '');
|
|
|
|
|
|
- if ($state === FreshRSS_Entry::STATE_NOT_READ) { //Any unread article in this category at all?
|
|
|
+ if ($this->view->state === FreshRSS_Entry::STATE_NOT_READ) { //Any unread article in this category at all?
|
|
|
switch ($getType) {
|
|
|
case 'a':
|
|
|
$hasUnread = $this->view->nb_not_read > 0;
|
|
|
@@ -104,7 +104,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
|
|
|
break;
|
|
|
}
|
|
|
if (!$hasUnread && ($state_param === null)) {
|
|
|
- $this->view->state = $state = FreshRSS_Entry::STATE_ALL;
|
|
|
+ $this->view->state = FreshRSS_Entry::STATE_ALL;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -117,11 +117,11 @@ class FreshRSS_index_Controller extends Minz_ActionController {
|
|
|
$keepHistoryDefault = $this->view->conf->keep_history_default;
|
|
|
|
|
|
try {
|
|
|
- $entries = $entryDAO->listWhere($getType, $getId, $state, $order, $nb + 1, $first, $filter, $date_min, true, $keepHistoryDefault);
|
|
|
+ $entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb + 1, $first, $filter, $date_min, true, $keepHistoryDefault);
|
|
|
|
|
|
// Si on a récupéré aucun article "non lus"
|
|
|
// on essaye de récupérer tous les articles
|
|
|
- if ($state === FreshRSS_Entry::STATE_NOT_READ && empty($entries) && ($state_param === null) && ($filter == '')) {
|
|
|
+ if ($this->view->state === FreshRSS_Entry::STATE_NOT_READ && empty($entries) && ($state_param === null) && ($filter == '')) {
|
|
|
Minz_Log::record('Conflicting information about nbNotRead!', Minz_Log::DEBUG);
|
|
|
$feedDAO = FreshRSS_Factory::createFeedDao();
|
|
|
try {
|
|
|
@@ -132,6 +132,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
|
|
|
$this->view->state = FreshRSS_Entry::STATE_ALL;
|
|
|
$entries = $entryDAO->listWhere($getType, $getId, $this->view->state, $order, $nb, $first, $filter, $date_min, true, $keepHistoryDefault);
|
|
|
}
|
|
|
+ Minz_Request::_param('state', $this->view->state);
|
|
|
|
|
|
if (count($entries) <= $nb) {
|
|
|
$this->view->nextId = '';
|