diff options
| author | 2014-04-15 10:10:29 +0200 | |
|---|---|---|
| committer | 2014-04-15 10:10:29 +0200 | |
| commit | 339a12698c07eb466c6a1ab8ffa856d8a8e1f506 (patch) | |
| tree | d599dd61687b5b4ccd5aa07ae5c500533dc4bcef /app/Controllers/importExportController.php | |
| parent | 951a137f2d05594dd0b61b9d86567cf4e9a12f5a (diff) | |
| parent | bdd7b7b13e6fdcdb9110cbee3618bf2b5fc89b71 (diff) | |
Merge pull request #486 from aledeg/simple-layout
New toggle buttons to filter articles (was: Delete favorite button)
Diffstat (limited to 'app/Controllers/importExportController.php')
| -rw-r--r-- | app/Controllers/importExportController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index a9b103a34..3cd791781 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -370,7 +370,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { $this->view->type = 'starred'; $unread_fav = $this->entryDAO->countUnreadReadFavorites(); $this->view->entries = $this->entryDAO->listWhere( - 's', '', 'all', 'ASC', + 's', '', FreshRSS_Entry::STATE_ALL, 'ASC', $unread_fav['all'] ); } elseif ($type == 'feed' && !is_null($feed)) { @@ -379,7 +379,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController { ); $this->view->type = 'feed/' . $feed->id(); $this->view->entries = $this->entryDAO->listWhere( - 'f', $feed->id(), 'all', 'ASC', + 'f', $feed->id(), FreshRSS_Entry::STATE_ALL, 'ASC', $this->view->conf->posts_per_page ); $this->view->feed = $feed; |
