adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 02:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding fix for Ticket #2130, Ticket #2168, Ticket #2178

Browse source 
Adding beforeRender() callback for helpers.
Adding fix for Set::diff();

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4575 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-03-04 09:12:09 +00:00
parent 55a66a9091
commit dea1dc77fb
3 changed files with 57 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/set.php
View file

@ -371,7 +371,9 @@ class Set extends Object {
return (array)$val1;
}
foreach ($val1 as $key => $val) {
if (!isset($val2[$key]) || $val2[$key] != $val) {
if (isset($val2[$key]) && $val2[$key] != $val) {
$out[$key] = $val;
} else if(!array_key_exists($key, $val2)){
$out[$key] = $val;
}
}
@ -484,4 +486,4 @@ class Set extends Object {
}
}
?>
?>