Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixing wrong usage of array_shift added in r7013
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8072 3807eeeb-6ff5-0310-8944-8be069107fe0
  • Loading branch information
mariano.iglesias committed Mar 3, 2009
1 parent 571f578 commit 591b9f0
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions cake/libs/controller/controller.php
Expand Up @@ -1017,7 +1017,8 @@ function paginate($object = null, $scope = array(), $whitelist = array()) {
$type = 'all';

if (isset($defaults[0])) {
$type = array_shift($defaults);
$type = $defaults[0];
unset($defaults[0]);
}
$extra = array_diff_key($defaults, compact(
'conditions', 'fields', 'order', 'limit', 'page', 'recursive'
Expand Down Expand Up @@ -1141,4 +1142,4 @@ function _scaffoldError($method) {
return false;
}
}
?>
?>

0 comments on commit 591b9f0

Please sign in to comment.