"Correcting code block"

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

View file

@ -561,7 +561,6 @@ 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])) {
@ -572,6 +571,7 @@ class SecurityComponent extends Object {
$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);