mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
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
This commit is contained in:
parent
571f57822d
commit
591b9f0582
1 changed files with 3 additions and 2 deletions
|
@ -1017,7 +1017,8 @@ class Controller extends Object {
|
|||
$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'
|
||||
|
@ -1141,4 +1142,4 @@ class Controller extends Object {
|
|||
return false;
|
||||
}
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
|
Loading…
Reference in a new issue