From 5d599381214f7d7d6aaad7762a257a84224ad282 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Thu, 3 Apr 2008 02:33:41 +0000
Subject: [PATCH] "Correcting code block"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6628 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/controller/components/security.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cake/libs/controller/components/security.php b/cake/libs/controller/components/security.php
index e08a5b48b..635d2f1d2 100644
--- a/cake/libs/controller/components/security.php
+++ b/cake/libs/controller/components/security.php
@@ -561,17 +561,17 @@ class SecurityComponent extends Object {
 								$merge[] = $lookup;
 							}
 						}
-					}
 
-					if (!is_numeric($k[0])) {
-						if (isset($field[$newKey])) {
-							$field[$newKey] = array_merge($merge, $field[$newKey]);
-						} else {
-							$field[$newKey] = $merge;
+						if (!is_numeric($k[0])) {
+							if (isset($field[$newKey])) {
+								$field[$newKey] = array_merge($merge, $field[$newKey]);
+							} else {
+								$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;
 				}
 				$keys = array_keys($value);