Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev

app/controllers/indexController.php

@@ -64,7 +64,7 @@ class indexController extends ActionController {
 		$catDAO = new CategoryDAO ();
 
 		$this->view->cat_aside = $catDAO->listCategories ();
-		$this->view->nb_favorites = $entryDAO->countFavorites ();
+		$this->view->nb_favorites = $entryDAO->countUnreadReadFavorites ();
 		$this->view->nb_total = $entryDAO->count ();
 		$this->view->currentName = '';
 

app/layout/aside_flux.phtml

@@ -22,9 +22,9 @@
 
 		<li>
 			<div class="category favorites">
-				<a data-unread="0" class="btn<?php echo $this->get_c == 'favoris' ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'favoris'); ?>">
+				<a data-unread="<?php echo $this->nb_favorites['unread']; ?>" class="btn<?php echo $this->get_c == 'favoris' ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'favoris'); ?>">
 					<i class="icon i_bookmark"></i>
-					<?php echo Translate::t ('favorite_feeds', $this->nb_favorites); ?>
+					<?php echo Translate::t ('favorite_feeds', $this->nb_favorites['read'] + $this->nb_favorites['unread']); ?>
 				</a>
 			</div>
 		</li>