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

Merge branch 'master' into 2.4

Browse source 
Conflicts:
	lib/Cake/Model/Model.php
This commit is contained in:
mark_story 2013-04-07 14:35:23 -04:00
commit 853e19e70e
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1600,12 +1600,15 @@ class Model extends Object implements CakeEventListener {
* @param array $data Data to save.
* @param boolean|array $validate Either a boolean, or an array.
* If a boolean, indicates whether or not to validate before saving.
* If an array, it can have one of the following options:
* - validate: Boolean as mentioned above
* - fieldList: See $fieldList parameter
* - callbacks: Controls callbacks triggering. Valid values: true, false, 'before', 'after'
* - counterCache: Boolean to control updating of counter caches (if any)
* @param array $fieldList List of fields to allow to be written
* If an array, can have following keys:
*
* - `validate`: Set to true/false to enable or disable validation.
* - `fieldList`: An array of fields you want to allow for saving.
* - `callbacks`: Set to false to disable callbacks. Using 'before' or 'after'
* will enable only those callbacks.
* - `counterCache`: Boolean to control updating of counter caches (if any)
*
* @param array $fieldList List of fields to allow to be saved
* @return mixed On success Model::$data if its not empty or true, false on failure
* @link http://book.cakephp.org/2.0/en/models/saving-your-data.html
*/