X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/92d393537c9de537d03141d8630d46fbe890f575..refs/pull/3238/head:/app/Providers/PaginationServiceProvider.php

diff --git a/app/Providers/PaginationServiceProvider.php b/app/Providers/PaginationServiceProvider.php
index a0e97f70d..416aa5f34 100644
--- a/app/Providers/PaginationServiceProvider.php
+++ b/app/Providers/PaginationServiceProvider.php
@@ -1,10 +1,11 @@
-<?php namespace BookStack\Providers;
+<?php
 
+namespace BookStack\Providers;
 
-use Illuminate\Support\ServiceProvider;
+use Illuminate\Pagination\PaginationServiceProvider as IlluminatePaginationServiceProvider;
 use Illuminate\Pagination\Paginator;
 
-class PaginationServiceProvider extends ServiceProvider
+class PaginationServiceProvider extends IlluminatePaginationServiceProvider
 {
     /**
      * Register the service provider.
@@ -13,8 +14,12 @@ class PaginationServiceProvider extends ServiceProvider
      */
     public function register()
     {
+        Paginator::viewFactoryResolver(function () {
+            return $this->app['view'];
+        });
+
         Paginator::currentPathResolver(function () {
-            return baseUrl($this->app['request']->path());
+            return url($this->app['request']->path());
         });
 
         Paginator::currentPageResolver(function ($pageName = 'page') {
@@ -27,4 +32,4 @@ class PaginationServiceProvider extends ServiceProvider
             return 1;
         });
     }
-}
\ No newline at end of file
+}