adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-07 20:12:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' into 2.1

Browse source
This commit is contained in:
mark_story 2012-03-03 23:20:18 -05:00
commit 50e7f4c995
2 changed files with 60 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/Cake/View/Helper/PaginatorHelper.php
View file

@ -199,13 +199,14 @@ class PaginatorHelper extends AppHelper {
$params = $this->params($model);
$options = $params['options'];
}
if (isset($options['sort']) && !empty($options['sort'])) {
return $options['sort'];
} elseif (isset($options['order']) && is_array($options['order'])) {
return key($options['order']);
} elseif (isset($options['order']) && is_string($options['order'])) {
return $options['order'];
}
if (isset($options['order'])) {
return is_array($options['order']) ? key($options['order']) : $options['order'];
}
if (isset($params['order'])) {
return is_array($params['order']) ? key($params['order']) : $params['order'];
}
return null;
}
@ -231,6 +232,8 @@ class PaginatorHelper extends AppHelper {
$dir = strtolower($options['direction']);
} elseif (isset($options['order']) && is_array($options['order'])) {
$dir = strtolower(current($options['order']));
} elseif (isset($params['order']) && is_array($params['order'])) {
$dir = strtolower(current($params['order']));
}
if ($dir == 'desc') {