Backporting changes form 2.2 to fix some edge cases on deep saving. F…

…ixes #2879
cakephp · May 20, 2012 · 16847b0 · 16847b0
1 parent 7dbd6bc
commit 16847b0
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
@@ -2343,6 +2343,11 @@ public function validateAssociated(&$data, $options = array()) {
 			$return[$this->alias] = true;
 		}
 		$data = $this->data;
+		if (!empty($options['deep']) && isset($data[$this->alias])) {
+			$recordData = $data[$this->alias];
+			unset($data[$this->alias]);
+			$data = array_merge($data, $recordData);
+		}
 
 		$associations = $this->getAssociated();
 		foreach ($data as $association => &$values) {