From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Sun, 10 Apr 2016 13:37:05 +0000 (+0200)
Subject: Merge pull request #1895 from wallabag/v2-fix-entries-api
X-Git-Tag: 2.0.1~9
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=f642863ff258972df90940a59510d14b6f366883;hp=615fc1d237a5b6f6ee1b9a1f7cea31f0738dae02;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1895 from wallabag/v2-fix-entries-api

All the entries are fetched via GET /api/entries
---

diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
index 744e1a60..da671a61 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) $request->query->get('archive');
+        $isStarred = (null === $request->query->get('starred')) ? null : (bool) $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);