Revert "Takes into account the current recursive value in deleteAll()."

cakephp · Jul 24, 2017 · cd6fba1 · cd6fba1
1 parent fef1029
commit cd6fba1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
@@ -2832,12 +2832,12 @@ public function deleteAll($conditions, $cascade = true, $callbacks = false) {
 		if (!$cascade && !$callbacks) {
 			return $db->delete($this, $conditions);
 		}
-		$recursive = min($this->recursive, 0);
+
 		$ids = $this->find('all', array_merge(array(
 			'fields' => "{$this->alias}.{$this->primaryKey}",
 			'order' => false,
 			'group' => "{$this->alias}.{$this->primaryKey}",
-			'recursive' => $recursive), compact('conditions'))
+			'recursive' => 0), compact('conditions'))
 		);
 
 		if ($ids === false || $ids === null) {