Don't pass validaiton preferences down to associations in Table::save()

Fixes #3873
cakephp · Jul 5, 2014 · 7ad59c9 · 7ad59c9
1 parent 9b20a21
commit 7ad59c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -1136,8 +1136,9 @@ protected function _processSave($entity, $options) {
 
 		$associated = $options['associated'];
 		$options['associated'] = [];
+		$validate = $options['validate'];
 
-		if ($options['validate'] && !$this->validate($entity, $options)) {
+		if ($validate && !$this->validate($entity, $options)) {
 			return false;
 		}
 
@@ -1153,7 +1154,7 @@ protected function _processSave($entity, $options) {
 			$this,
 			$entity,
 			$options['associated'],
-			$options->getArrayCopy()
+			['validate' => (bool)$validate] + $options->getArrayCopy()
 		);
 
 		if (!$saved && $options['atomic']) {

diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php
@@ -2106,7 +2106,7 @@ public function testSaveWithDifferentValidatorAndAssociations() {
 		$this->assertFalse($table->save($entity, ['validate' => 'custom']));
 		$this->assertNotEmpty($entity->author->errors('thing'));
 
-		$this->assertSame($entity, $table->save($entity), 'default was not used');
+		$this->assertFalse($table->save($entity), 'default was not used');
 	}
 
 /**