Pass options into cascaded deletes.

cakephp · Nov 3, 2013 · 701822c · 701822c
1 parent 1c38fc7
commit 701822c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Cake/ORM/Association/DependentDeleteTrait.php b/Cake/ORM/Association/DependentDeleteTrait.php
@@ -50,7 +50,7 @@ public function cascadeDelete(Entity $entity, $options = []) {
 
 		$query = $table->find('all')->where($conditions);
 		foreach ($query as $related) {
-			$table->delete($related, ['atomic' => false]);
+			$table->delete($related, $options);
 		}
 		return true;
 	}

diff --git a/Cake/Test/TestCase/ORM/Association/HasManyTest.php b/Cake/Test/TestCase/ORM/Association/HasManyTest.php
@@ -469,10 +469,10 @@ public function testCascadeDelete() {
 
 		$this->article->expects($this->at(1))
 			->method('delete')
-			->with($articleOne, ['atomic' => false]);
+			->with($articleOne, []);
 		$this->article->expects($this->at(2))
 			->method('delete')
-			->with($articleTwo, ['atomic' => false]);
+			->with($articleTwo, []);
 
 		$entity = new Entity(['id' => 1, 'name' => 'mark']);
 		$this->assertTrue($association->cascadeDelete($entity));