diff options
| author | 2014-05-13 19:36:34 +0200 | |
|---|---|---|
| committer | 2014-05-13 19:36:34 +0200 | |
| commit | e763cd407a57e4829c2b6ffbddb164e5676670d7 (patch) | |
| tree | 7f61e697e3bc4407f73f8d341900bca392ac57a3 /app/Controllers/importExportController.php | |
| parent | 4580e177e1986f50c71abb26e90800dc46028693 (diff) | |
| parent | c96c80ee9afe03e97229be71e5bc3ea397cfb260 (diff) | |
Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev
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; |
