nitpicks

spatie · Oct 30, 2017 · 8fe1ffb · 8fe1ffb
1 parent 100764c
commit 8fe1ffb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -1,3 +1 @@
 preset: laravel
-
-linting: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to `spatie/laravel-paginateroute` will be documented in this file.
 
+## 2.6.0 - 2017-10-30
+- preserve query string on pagination urls
+
 ## 2.5.0 - 2017-05-15
 - add support for Arabic
 

diff --git a/src/PaginateRoute.php b/src/PaginateRoute.php
@@ -8,6 +8,7 @@
 use Illuminate\Contracts\Pagination\Paginator;
 use Illuminate\Contracts\Routing\UrlGenerator;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Request;
 
 class PaginateRoute
 {
@@ -301,9 +302,11 @@ public function pageUrl($page, $full = false)
             $url = str_replace(['{'.$parameterName.'}', '{'.$parameterName.'?}'], $parameterValue, $url);
         }
 
-        $query = \Request::getQueryString();
+        $query = Request::getQueryString();
 
-        return $this->urlGenerator->to($url).($query ? '?'.$query : '');
+        return $this->urlGenerator->to($url).$query
+            ? '?'.$query
+            : '';
     }
 
     /**