From cd6fba136161993eb75913c55e1a3bf3da036e52 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Mon, 24 Jul 2017 00:09:01 -0400 Subject: [PATCH] Revert "Takes into account the current recursive value in deleteAll()." --- lib/Cake/Model/Model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php index 96721997017..3813e3883ed 100644 --- 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) {