Fix paginator defaulting for multi-default-sort.

cakephp · Nov 9, 2018 · 756cf7e · 756cf7e
1 parent 21c8fce
commit 756cf7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Datasource/Paginator.php b/src/Datasource/Paginator.php
@@ -221,7 +221,7 @@ public function paginate($object, array $params = [], array $settings = [])
             'nextPage' => $count > ($page * $limit),
             'pageCount' => $pageCount,
             'sort' => $options['sort'],
-            'direction' => current($order),
+            'direction' => isset($options['sort']) ? current($order) : null,
             'limit' => $defaults['limit'] != $limit ? $limit : null,
             'sortDefault' => $sortDefault,
             'directionDefault' => $directionDefault,

diff --git a/src/View/Helper/PaginatorHelper.php b/src/View/Helper/PaginatorHelper.php
@@ -436,6 +436,7 @@ public function sort($key, $title = null, array $options = [])
 
             $title = __(Inflector::humanize(preg_replace('/_id$/', '', $title)));
         }
+
         $defaultDir = isset($options['direction']) ? strtolower($options['direction']) : 'asc';
         unset($options['direction']);