From cd87e2000a4e49271d30b1ef04a4e4d6e58119cb Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Sun, 13 Apr 2014 07:35:17 -0400 Subject: [PATCH] Revert deletion of the favorite actions --- app/Controllers/indexController.php | 4 ++++ app/Models/EntryDAO.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 48471b480..52dd01e0a 100755 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -96,6 +96,10 @@ class FreshRSS_index_Controller extends Minz_ActionController { case 'a': $hasUnread = $this->view->nb_not_read > 0; break; + case 's': + // This is deprecated. The favorite button does not exist anymore + $hasUnread = $this->view->nb_favorites['unread'] > 0; + break; case 'c': $hasUnread = (!isset($this->view->cat_aside[$getId])) || ($this->view->cat_aside[$getId]->nbNotRead() > 0); break; diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index b9cbfd584..3f3cc478b 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -418,6 +418,10 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo { $where .= 'f.priority > 0 '; $joinFeed = true; break; + case 's': + // This is deprecated. The favorite button does not exist anymore + $where .= 'e1.is_favorite = 1 '; + break; case 'c': $where .= 'f.category = ? '; $values[] = intval($id);