Make sure direction values are lowercased to be consistent.

cakephp · Oct 27, 2015 · 928c7ca · 928c7ca
1 parent 9d7d63c
commit 928c7ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/View/Helper/PaginatorHelper.php b/src/View/Helper/PaginatorHelper.php
@@ -402,7 +402,7 @@ public function sort($key, $title = null, array $options = [])
 
             $title = __(Inflector::humanize(preg_replace('/_id$/', '', $title)));
         }
-        $defaultDir = isset($options['direction']) ? $options['direction'] : 'asc';
+        $defaultDir = isset($options['direction']) ? strtolower($options['direction']) : 'asc';
         unset($options['direction']);
 
         $locked = isset($options['lock']) ? $options['lock'] : false;

diff --git a/tests/TestCase/View/Helper/PaginatorHelperTest.php b/tests/TestCase/View/Helper/PaginatorHelperTest.php
@@ -233,7 +233,7 @@ public function testSortLinks()
 
         $this->Paginator->request->params['paging']['Article']['sort'] = 'Article.title';
         $this->Paginator->request->params['paging']['Article']['direction'] = 'desc';
-        $result = $this->Paginator->sort('title', 'Title', ['direction' => 'asc']);
+        $result = $this->Paginator->sort('title', 'Title', ['direction' => 'ASC']);
         $expected = [
             'a' => ['href' => '/accounts/index/param?sort=title&amp;direction=asc', 'class' => 'desc'],
             'Title',