Don’t manually pass pagination page default #1887

Otherwise the ErrorPageException would get thrown if the pagination does not contain elements and therefore does not have any pages; the default page is now automatically determined if not passed.
getkirby · Sep 29, 2019 · bfaba54 · bfaba54
1 parent c751187
commit bfaba54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config/sections/mixins/pagination.php b/config/sections/mixins/pagination.php
@@ -14,7 +14,7 @@
          * Sets the default page for the pagination. This will overwrite default pagination.
          */
         'page' => function (int $page = null) {
-            return get('page', $page ?? 1);
+            return get('page', $page);
         },
     ],
     'methods' => [

diff --git a/src/Cms/Pagination.php b/src/Cms/Pagination.php
@@ -81,9 +81,9 @@ public function __construct(array $params = [])
         }
 
         if ($params['method'] === 'query') {
-            $params['page'] = $params['page'] ?? $params['url']->query()->get($params['variable'], 1);
+            $params['page'] = $params['page'] ?? $params['url']->query()->get($params['variable']);
         } else {
-            $params['page'] = $params['page'] ?? $params['url']->params()->get($params['variable'], 1);
+            $params['page'] = $params['page'] ?? $params['url']->params()->get($params['variable']);
         }
 
         parent::__construct($params);