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 up the fails

Browse source
This commit is contained in:
dogmatic69 2012-12-04 01:58:57 +00:00
parent 24abed969a
commit 03882f4b55
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Model/ModelValidator.php
View file

@ -155,10 +155,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
$data[$association] = $model->{$association}->data[$model->{$association}->alias]; $data[$association] = $model->{$association}->data[$model->{$association}->alias];
} }
if (is_array($validates)) { if (is_array($validates)) {
$validates = true; $validates = !in_array(false, Hash::flatten($validates), true);
if (in_array(false, Hash::flatten($validates), true)) {
$validates = false;
}
} }
$return[$association] = $validates; $return[$association] = $validates;
} elseif ($associations[$association] === 'hasMany') { } elseif ($associations[$association] === 'hasMany') {
@ -217,10 +214,11 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
$validates = $model->set($record) && $model->validates($options); $validates = $model->set($record) && $model->validates($options);
$data[$key] = $model->data; $data[$key] = $model->data;
} }
$validates = true;
if ($validates === false || (is_array($validates) && in_array(false, Hash::flatten($validates), true))) { if ($validates === false || (is_array($validates) && in_array(false, Hash::flatten($validates), true))) {
$validationErrors[$key] = $model->validationErrors; $validationErrors[$key] = $model->validationErrors;
$validates = false; $validates = false;
} else {
$validates = true;
} }
$return[$key] = $validates; $return[$key] = $validates;
} }