mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-31 09:06:17 +00:00
Updating Set::reverse()
Corrected undefined variable git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5372 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
cd09a7c7dd
commit
382a63651d
1 changed files with 10 additions and 11 deletions
|
@ -684,20 +684,19 @@ class Set extends Object {
|
|||
if ($keys[$i] == '__identity__') {
|
||||
unset($object[$keys[$i]]);
|
||||
} elseif (is_array($object[$keys[$i]])) {
|
||||
$keys1 = array_keys($object[$keys[$i]]);
|
||||
$count1 = count($keys1);
|
||||
for ($ii = 0; $ii < $count1; $ii++) {
|
||||
$merge[$keys[$i]][$ii] = Set::reverse($object[$keys[$i]][$ii]);
|
||||
}
|
||||
unset($object[$keys[$i]]);
|
||||
} elseif (is_object($object[$keys[$i]])) {
|
||||
$object1 = get_object_vars($one[$keys[$i]]);
|
||||
$keys1 = array_keys($object1);
|
||||
$keys1 = array_keys($object[$keys[$i]]);
|
||||
$count1 = count($keys1);
|
||||
for ($ii = 0; $ii < $count1; $ii++) {
|
||||
$merge[$keys[$i]][$ii] = Set::reverse($object1[$keys1[$i]][$ii]);
|
||||
if (is_object($object[$keys[$i]][$keys1[$ii]])) {
|
||||
$merge[$keys[$i]][$keys1[$ii]] = Set::reverse($object[$keys[$i]][$keys1[$ii]]);
|
||||
} else {
|
||||
$merge[$keys[$i]][$keys1[$ii]] = $object[$keys[$i]][$keys1[$ii]];
|
||||
}
|
||||
}
|
||||
unset($object[$keys[$i]]);
|
||||
} elseif (is_object($object[$keys[$i]])) {
|
||||
$merge[$keys[$i]] = Set::reverse($object[$keys[$i]]);
|
||||
unset($object[$keys[$i]]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -709,4 +708,4 @@ class Set extends Object {
|
|||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
|
Loading…
Add table
Reference in a new issue