From 75f8898dcdfca963b731dffe7c1766d60fd410ea Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 4 Dec 2012 22:41:45 +0100
Subject: Fix issue #21 - bug affichage lorsque non lus par défaut
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/indexController.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'app/controllers/indexController.php')

diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php
index 7d878108d..4002a0032 100755
--- a/app/controllers/indexController.php
+++ b/app/controllers/indexController.php
@@ -10,7 +10,16 @@ class indexController extends ActionController {
 		$entryDAO = new EntryDAO ();
 		$catDAO = new CategoryDAO ();
 		
-		$mode = Session::param ('mode', $this->view->conf->defaultView ());
+		$default_view = $this->view->conf->defaultView ();
+		$mode = Session::param ('mode');
+		if ($mode == false) {
+			if ($default_view == 'not_read' && $this->view->nb_not_read < 1) {
+				$mode = 'all';
+			} else {
+				$mode = $default_view;
+			}
+		}
+		
 		$get = Request::param ('get');
 		$order = $this->view->conf->sortOrder ();
 		
@@ -34,6 +43,7 @@ class indexController extends ActionController {
 			View::prependTitle ('Vos flux RSS - ');
 		}
 		$this->view->get = $get;
+		$this->view->mode = $mode;
 		
 		// Cas où on ne choisie ni catégorie ni les favoris
 		// ou si la catégorie ne correspond à aucune
-- 
cgit v1.2.3