Fixed a small issue when using dot notation for Table::save() options

cakephp · Jun 15, 2014 · 3bc6c2a · 3bc6c2a
1 parent a751d37
commit 3bc6c2a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/ORM/Associations.php b/src/ORM/Associations.php
@@ -279,11 +279,9 @@ public function normalizeKeys($keys) {
 			$path = explode('.', $table);
 			$table = array_pop($path);
 			$first = array_shift($path);
-
-			if (isset($pointer[$first])) {
-				$pointer =& $pointer[$first];
-				$pointer += ['associated' => []];
-			}
+			$pointer += [$first => []];
+			$pointer =& $pointer[$first];
+			$pointer += ['associated' => []];
 
 			foreach ($path as $t) {
 				$pointer += ['associated' => []];
@@ -296,7 +294,7 @@ public function normalizeKeys($keys) {
 			$pointer['associated'][$table] = $options + $pointer['associated'][$table];
 		}
 
-		return $result;
+		return isset($result['associated']) ? $result['associated'] : $result;
 	}
 
 }