From 388b20dd9d4555c60aaddafb18f87e50c3d17563 Mon Sep 17 00:00:00 2001
From: Ceeram <c33ram@gmail.com>
Date: Tue, 17 Apr 2012 00:22:13 +0200
Subject: [PATCH] fix error in previous commit

---
 lib/Cake/Model/Model.php                    |  6 ++++--
 lib/Cake/Test/Case/Model/ModelWriteTest.php | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
index 36e22d247e6..422b8697644 100644
--- a/lib/Cake/Model/Model.php
+++ b/lib/Cake/Model/Model.php
@@ -2191,7 +2191,8 @@ public function saveAssociated($data = null, $options = array()) {
 		$return = array();
 		$validates = true;
 		foreach ($data as $association => $values) {
-			if (isset($associations[$association]) && $associations[$association] === 'belongsTo') {
+			$notEmpty = !empty($values[$association]) || (!isset($values[$association]) && !empty($values));
+			if (isset($associations[$association]) && $associations[$association] === 'belongsTo' && $notEmpty) {
 				$validates = $this->{$association}->create(null) !== null;
 				$saved = false;
 				if ($validates) {
@@ -2225,7 +2226,8 @@ public function saveAssociated($data = null, $options = array()) {
 			if (!$validates) {
 				break;
 			}
-			if (isset($associations[$association])) {
+			$notEmpty = !empty($values[$association]) || (!isset($values[$association]) && !empty($values));
+			if (isset($associations[$association]) && $notEmpty) {
 				$type = $associations[$association];
 				$key = $this->{$type}[$association]['foreignKey'];
 				switch ($type) {
diff --git a/lib/Cake/Test/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php
index 63d40994766..c06c964d921 100644
--- a/lib/Cake/Test/Case/Model/ModelWriteTest.php
+++ b/lib/Cake/Test/Case/Model/ModelWriteTest.php
@@ -5237,11 +5237,28 @@ public function testSaveAssociatedHasManyEmpty() {
 		$this->loadFixtures('Article', 'Comment');
 		$TestModel = new Article();
 		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
+		$TestModel->validate = $TestModel->Comment->validate = array('user_id' => array('notEmpty' => array('rule' => 'notEmpty', 'required' => true)));
+
+		//empty hasMany data is ignored in save
 		$result = $TestModel->saveAssociated(array(
-			'Article' => array('title' => 'title', 'author_id' => 1),
+			'Article' => array('title' => 'title', 'user_id' => 1),
 			'Comment' => array()
 		), array('validate' => true));
 		$this->assertTrue($result);
+
+		$result = $TestModel->saveAssociated(array(
+			'Article' => array('title' => 'title', 'user_id' => 1),
+			'Comment' => array()
+		), array('validate' => true, 'atomic' => false));
+		$this->assertEquals(array('Article' => true), $result);
+
+		//empty primary data is not ignored
+		$result = $TestModel->saveAssociated(array('Article' => array()), array('validate' => true));
+		$this->assertFalse($result);
+
+		$result = $TestModel->saveAssociated(array('Article' => array()), array('validate' => true, 'atomic' => false));
+		$this->assertEquals(array('Article' => false), $result);
+
 	}
 
 /**