adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warnings when deleting records that do not exist.

Browse source 
Fixes #3037
This commit is contained in:
mark_story 2012-07-14 15:54:07 -04:00
parent 6c905411ba
commit a7c79e5da2
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Model/Behavior/TreeBehavior.php
View file

@ -124,11 +124,13 @@ class TreeBehavior extends ModelBehavior {
*/ */
public function beforeDelete(Model $Model, $cascade = true) { public function beforeDelete(Model $Model, $cascade = true) {
extract($this->settings[$Model->alias]); extract($this->settings[$Model->alias]);
$data = current($Model->find('first', array( $data = $Model->find('first', array(
'conditions' => array($Model->alias . '.' . $Model->primaryKey => $Model->id), 'conditions' => array($Model->alias . '.' . $Model->primaryKey => $Model->id),
'fields' => array($Model->alias . '.' . $left, $Model->alias . '.' . $right), 'fields' => array($Model->alias . '.' . $left, $Model->alias . '.' . $right),
'recursive' => -1))); 'recursive' => -1));
$this->_deletedRow = $data; if ($data) {
$this->_deletedRow = current($data);
}
return true; return true;
} }

12
lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
View file

@ -914,6 +914,18 @@ class TreeBehaviorNumberTest extends CakeTestCase {
$this->assertSame($validTree, true); $this->assertSame($validTree, true);
} }
/**
* Test deleting a record that doesn't exist.
*
* @return void
*/
public function testDeleteDoesNotExist() {
extract($this->settings);
$this->Tree = new $modelClass();
$this->Tree->initialize(2, 2);
$this->Tree->delete(99999);
}
/** /**
* testRemove method * testRemove method
* *