adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-07 03:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correcting inconsistent return values in Model::saveAll(), updating bad tests, fixes #4981

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7283 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2008-06-27 06:07:00 +00:00
parent 0fc7355e6b
commit 14e8c5fe7b
3 changed files with 56 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/db_acl.php
View file

@ -117,7 +117,7 @@ class AclNode extends AppModel {
'conditions' => array(
$db->name("{$type}{$i}.lft") . ' > ' . $db->name("{$type}{$j}.lft"),
$db->name("{$type}{$i}.rght") . ' < ' . $db->name("{$type}{$j}.rght"),
$db->name("{$type}{$i}.alias") . ' = ' . $db->value($alias)
$db->name("{$type}{$i}.alias") . ' = ' . $db->value($alias, 'string')
)
);

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

@ -1350,7 +1350,7 @@ class Model extends Overloadable {
switch (true) {
case ($options['validate'] === 'only'):
return $validates;
return ($options['atomic'] ? $validates : $return);
break;
case ($options['validate'] === 'first'):
$options['validate'] = true;
@ -1395,7 +1395,7 @@ class Model extends Overloadable {
$validates = false;
}
if (!$options['atomic']) {
$return[$this->alias][] = $validates;
$return[$this->alias] = $validates;
}
$validating = ($options['validate'] === 'only' || $options['validate'] === 'first');
@ -1447,15 +1447,15 @@ class Model extends Overloadable {
}
}
}
$this->validationErrors = $validationErrors;
if (isset($validationErrors[$this->alias])) {
$this->validationErrors = $validationErrors[$this->alias];
}
switch (true) {
case ($options['validate'] === 'only'):
return $validates;
return ($options['atomic'] ? $validates : $return);
break;
case ($options['validate'] === 'first'):
$options['validate'] = true;