From: Nicolas LÅ“uillet Date: Sat, 9 Apr 2016 19:13:56 +0000 (+0200) Subject: All the entries are fetched via GET /api/entries X-Git-Tag: 2.0.1~9^2~1 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=5c3ca4fe9eb1db2fa11c0809c54538430b89b1fc;p=github%2Fwallabag%2Fwallabag.git All the entries are fetched via GET /api/entries Fix #1863: only the unread entries were fetched with GET /api/entries entrypoint. Now, all the entries are fetched --- diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index 744e1a60..fe3495f8 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php @@ -43,8 +43,8 @@ class WallabagRestController extends FOSRestController { $this->validateAuthentication(); - $isArchived = (int) $request->query->get('archive'); - $isStarred = (int) $request->query->get('starred'); + $isArchived = (null === $request->query->get('archive')) ? null : (bool) (int) $request->query->get('archive'); + $isStarred = (null === $request->query->get('starred')) ? null : (bool) (int) $request->query->get('starred'); $sort = $request->query->get('sort', 'created'); $order = $request->query->get('order', 'desc'); $page = (int) $request->query->get('page', 1); @@ -52,7 +52,7 @@ class WallabagRestController extends FOSRestController $pager = $this->getDoctrine() ->getRepository('WallabagCoreBundle:Entry') - ->findEntries($this->getUser()->getId(), (bool) $isArchived, (bool) $isStarred, $sort, $order); + ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order); $pager->setCurrentPage($page); $pager->setMaxPerPage($perPage);