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

"Correcting code block"

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6628 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2008-04-03 02:33:41 +00:00
parent f2941a660e
commit 5d59938121
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cake/libs/controller/components/security.php
View file

@ -561,17 +561,17 @@ class SecurityComponent extends Object {
$merge[] = $lookup; $merge[] = $lookup;
} }
} }
}
if (!is_numeric($k[0])) { if (!is_numeric($k[0])) {
if (isset($field[$newKey])) { if (isset($field[$newKey])) {
$field[$newKey] = array_merge($merge, $field[$newKey]); $field[$newKey] = array_merge($merge, $field[$newKey]);
} else { } else {
$field[$newKey] = $merge; $field[$newKey] = $merge;
}
$controller->data[$newKey] = Set::pushDiff($controller->data[$key], $controller->data[$newKey]);
} }
$controller->data[$newKey] = Set::pushDiff($controller->data[$key], $controller->data[$newKey]); unset($controller->data[$key]);
} }
unset($controller->data[$key]);
continue; continue;
} }
$keys = array_keys($value); $keys = array_keys($value);