adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10739 from bancer/unnecessary-joins-delete-all

Browse source 
Takes into account the current recursive value in deleteAll().
This commit is contained in:
Mark Story 2017-06-08 12:01:34 -04:00 committed by GitHub
commit 77b7ccf3ad
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Model/Model.php
View file

@ -2832,12 +2832,12 @@ class Model extends CakeObject implements CakeEventListener {
if (!$cascade && !$callbacks) { if (!$cascade && !$callbacks) {
return $db->delete($this, $conditions); return $db->delete($this, $conditions);
} }
$recursive = min($this->recursive, 0);
$ids = $this->find('all', array_merge(array( $ids = $this->find('all', array_merge(array(
'fields' => "{$this->alias}.{$this->primaryKey}", 'fields' => "{$this->alias}.{$this->primaryKey}",
'order' => false, 'order' => false,
'group' => "{$this->alias}.{$this->primaryKey}", 'group' => "{$this->alias}.{$this->primaryKey}",
'recursive' => 0), compact('conditions')) 'recursive' => $recursive), compact('conditions'))
); );
if ($ids === false || $ids === null) { if ($ids === false || $ids === null) {