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

Restore whitelist when save fails.

Browse source 
Fixes whitelist not being restored when save fails due to no data.

Fixes #3646
This commit is contained in:
mark_story 2013-02-25 20:57:39 -05:00
parent 3d0920a405
commit 33bd7a571a
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1626,6 +1626,7 @@ class Model extends Object implements CakeEventListener {
$this->set($data);
if (empty($this->data) && !$this->hasField(array('created', 'updated', 'modified'))) {
$this->whitelist = $_whitelist;
return false;
}

16
lib/Cake/Test/Case/Model/ModelWriteTest.php
View file

@ -275,6 +275,22 @@ class ModelWriteTest extends BaseModelTest {
Configure::write('Cache.disable', $_back['disable']);
}
/**
* test that save() resets whitelist on failed save
*/
public function testSaveFieldListResetsWhitelistOnFailedSave() {
$this->loadFixtures('Bidding');
$model = new Bidding();
$whitelist = array('title');
$model->whitelist = $whitelist;
$result = $model->save(
array(),
array('fieldList' => array('body'))
);
$this->assertFalse($result);
$this->assertEquals($whitelist, $model->whitelist);
}
/**
* testSaveWithCounterCache method
*