adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating Set::reverse()

Browse source 
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:
phpnut 2007-07-02 17:13:35 +00:00
parent cd09a7c7dd
commit 382a63651d
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cake/libs/set.php
View file

@ -687,16 +687,15 @@ class Set extends Object {
$keys1 = array_keys($object[$keys[$i]]); $keys1 = array_keys($object[$keys[$i]]);
$count1 = count($keys1); $count1 = count($keys1);
for ($ii = 0; $ii < $count1; $ii++) { for ($ii = 0; $ii < $count1; $ii++) {
$merge[$keys[$i]][$ii] = Set::reverse($object[$keys[$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]]); unset($object[$keys[$i]]);
} elseif (is_object($object[$keys[$i]])) { } elseif (is_object($object[$keys[$i]])) {
$object1 = get_object_vars($one[$keys[$i]]); $merge[$keys[$i]] = Set::reverse($object[$keys[$i]]);
$keys1 = array_keys($object1);
$count1 = count($keys1);
for ($ii = 0; $ii < $count1; $ii++) {
$merge[$keys[$i]][$ii] = Set::reverse($object1[$keys1[$i]][$ii]);
}
unset($object[$keys[$i]]); unset($object[$keys[$i]]);
} }
} }