adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 02:26:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Applied patch by 'preloader', closes #4561

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6937 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
the_undefined 2008-05-19 02:31:26 +00:00
parent abe853a978
commit 71790792d0
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/model/model.php
View file

@ -1419,7 +1419,11 @@ class Model extends Overloadable {
} }
} }
} }
$this->validationErrors = $validationErrors; $this->validationErrors = $validationErrors;
if (isset($validationErrors[$this->alias])) {
$this->validationErrors = $validationErrors[$this->alias];
}
switch (true) { switch (true) {
case ($options['validate'] === 'only'): case ($options['validate'] === 'only'):

9
cake/tests/cases/libs/model/model.test.php
View file

@ -2222,7 +2222,8 @@ class ModelTest extends CakeTestCase {
'Comment' => array('comment' => 'This field cannot be left blank'), 'Comment' => array('comment' => 'This field cannot be left blank'),
'Attachment' => array('attachment' => 'This field cannot be left blank') 'Attachment' => array('attachment' => 'This field cannot be left blank')
); );
$this->assertEqual($model->validationErrors, $expected); $this->assertEqual($model->validationErrors, $expected['Comment']);
$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
$this->assertFalse($model->saveAll( $this->assertFalse($model->saveAll(
array( array(
@ -2231,7 +2232,8 @@ class ModelTest extends CakeTestCase {
), ),
array('validate' => 'only') array('validate' => 'only')
)); ));
$this->assertEqual($model->validationErrors, $expected); $this->assertEqual($model->validationErrors, $expected['Comment']);
$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
} }
function testSaveAllAtomic() { function testSaveAllAtomic() {
@ -2498,7 +2500,8 @@ class ModelTest extends CakeTestCase {
$result = $model->find('all'); $result = $model->find('all');
$this->assertEqual($result, array()); $this->assertEqual($result, array());
$expected = array('Comment' => array(0 => array('comment' => 'This field cannot be left blank'))); $expected = array('Comment' => array(0 => array('comment' => 'This field cannot be left blank')));
$this->assertEqual($model->validationErrors, $expected);
$this->assertEqual($model->Comment->validationErrors, $expected['Comment']);
$this->assertIdentical($model->Comment->find('count'), 0); $this->assertIdentical($model->Comment->find('count'), 0);