mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-09-03 10:02:42 +00:00
Changed default value for option 'validate' to 'first' in Model::saveAll(). Also fixed issue where the return array contained more keys then number of records in data array itself with options 'validate =>'first' and 'atomic'=>false
This commit is contained in:
parent
7b28fdec85
commit
d365fafe4d
2 changed files with 11 additions and 8 deletions
|
@ -1556,9 +1556,9 @@ class Model extends Overloadable {
|
|||
*
|
||||
* #### Options
|
||||
*
|
||||
* - validate: Set to false to disable validation, true to validate each record before
|
||||
* saving, 'first' to validate *all* records before any are saved, or 'only' to only
|
||||
* validate the records, but not save them.
|
||||
* - validate: Set to false to disable validation, true to validate each record before saving,
|
||||
* 'first' to validate *all* records before any are saved (default),
|
||||
* or 'only' to only validate the records, but not save them.
|
||||
* - atomic: If true (default), will attempt to save all records in a single transaction.
|
||||
* Should be set to false if database/table does not support transactions.
|
||||
* - fieldList: Equivalent to the $fieldList parameter in Model::save()
|
||||
|
@ -1579,7 +1579,7 @@ class Model extends Overloadable {
|
|||
}
|
||||
$db =& ConnectionManager::getDataSource($this->useDbConfig);
|
||||
|
||||
$options = array_merge(array('validate' => true, 'atomic' => true), $options);
|
||||
$options = array_merge(array('validate' => 'first', 'atomic' => true), $options);
|
||||
$this->validationErrors = $validationErrors = array();
|
||||
$validates = true;
|
||||
$return = array();
|
||||
|
@ -1626,6 +1626,7 @@ class Model extends Overloadable {
|
|||
break;
|
||||
case ($options['validate'] === 'first'):
|
||||
$options['validate'] = true;
|
||||
$return = array();
|
||||
continue;
|
||||
break;
|
||||
default:
|
||||
|
@ -1731,6 +1732,7 @@ class Model extends Overloadable {
|
|||
break;
|
||||
case ($options['validate'] === 'first'):
|
||||
$options['validate'] = true;
|
||||
$return = array();
|
||||
continue;
|
||||
break;
|
||||
default:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue