diff options
author | adev <adev2000@gmail.com> | 2017-05-08 16:27:16 +0200 |
---|---|---|
committer | adev <adev2000@gmail.com> | 2017-05-08 16:27:16 +0200 |
commit | b60a666df22cb9174bdc4506d71cbc9e8ba6b1c9 (patch) | |
tree | b0a743684f44281e1e702b56674dd16ad2424d59 /src | |
parent | f2beee5185e0bf7f983fb97a34480b4c74d7eb8c (diff) | |
download | wallabag-b60a666df22cb9174bdc4506d71cbc9e8ba6b1c9.tar.gz wallabag-b60a666df22cb9174bdc4506d71cbc9e8ba6b1c9.tar.zst wallabag-b60a666df22cb9174bdc4506d71cbc9e8ba6b1c9.zip |
Fix API pagination is broken if perPage is custom value
Fix #2720
Diffstat (limited to 'src')
-rw-r--r-- | src/Wallabag/ApiBundle/Controller/EntryRestController.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php index 2c2ec0c1..c544815e 100644 --- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php +++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php | |||
@@ -98,12 +98,13 @@ class EntryRestController extends WallabagRestController | |||
98 | $tags = $request->query->get('tags', ''); | 98 | $tags = $request->query->get('tags', ''); |
99 | $since = $request->query->get('since', 0); | 99 | $since = $request->query->get('since', 0); |
100 | 100 | ||
101 | /** @var \Pagerfanta\Pagerfanta $pager */ | ||
101 | $pager = $this->getDoctrine() | 102 | $pager = $this->getDoctrine() |
102 | ->getRepository('WallabagCoreBundle:Entry') | 103 | ->getRepository('WallabagCoreBundle:Entry') |
103 | ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags); | 104 | ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags); |
104 | 105 | ||
105 | $pager->setCurrentPage($page); | ||
106 | $pager->setMaxPerPage($perPage); | 106 | $pager->setMaxPerPage($perPage); |
107 | $pager->setCurrentPage($page); | ||
107 | 108 | ||
108 | $pagerfantaFactory = new PagerfantaFactory('page', 'perPage'); | 109 | $pagerfantaFactory = new PagerfantaFactory('page', 'perPage'); |
109 | $paginatedCollection = $pagerfantaFactory->createRepresentation( | 110 | $paginatedCollection = $pagerfantaFactory->createRepresentation( |