adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding fix for failing tests on php 5

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5374 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-07-02 21:27:20 +00:00
parent 3880f9ce13
commit 072ed9581f
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cake/libs/set.php
View file

@ -709,8 +709,21 @@ class Set extends Object {
$objectKeys = array_keys($object);
$count = count($mergeKeys);
$change = $object;
$count1 = count($objectKeys);
for ($i = 0; $i < $count; $i++) {
$loop = $count1;
for ($ii = 0; $ii < $loop; $ii++) {
if(is_array($object[$objectKeys[$ii]])) {
if(array_key_exists($objectKeys[$ii], $object[$objectKeys[$ii]])) {
unset($change[$objectKeys[$ii]][$objectKeys[$ii]]);
}
} else {
unset($change[$objectKeys[$ii]]);
}
}
foreach ($objectKeys as $key => $value) {
if(is_array($object[$value])) {
if(array_key_exists($mergeKeys[$i], $object[$value])) {
@ -720,6 +733,7 @@ class Set extends Object {
unset($change[$value]);
}
}
}
$object = Set::pushDiff($change, $merge);
}