From 59969a46774d9aff9c7a5fce1e030fbcab24d00a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 17 Jul 2016 13:31:31 +0300
Subject: [PATCH] Fix for API pagination

---
 app/Http/Controllers/BaseAPIController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/BaseAPIController.php b/app/Http/Controllers/BaseAPIController.php
index 8c3e59fcacb9..4022408794e3 100644
--- a/app/Http/Controllers/BaseAPIController.php
+++ b/app/Http/Controllers/BaseAPIController.php
@@ -139,8 +139,10 @@ class BaseAPIController extends Controller
 
         if (is_a($query, "Illuminate\Database\Eloquent\Builder")) {
             $limit = min(MAX_API_PAGE_SIZE, Input::get('per_page', DEFAULT_API_PAGE_SIZE));
-            $resource = new Collection($query->get(), $transformer, $entityType);
-            $resource->setPaginator(new IlluminatePaginatorAdapter($query->paginate($limit)));
+            $paginator = $query->paginate($limit);
+            $query = $paginator->getCollection();
+            $resource = new Collection($query, $transformer, $entityType);
+            $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
         } else {
             $resource = new Collection($query, $transformer, $entityType);
         }