adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made custom save $options available throughout all filters and callbacks

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6861 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
the_undefined 2008-05-13 23:34:59 +00:00
parent b6a085b90e
commit dd7aa25a20
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1059,7 +1059,7 @@ class Model extends Overloadable {
if (isset($this->data[$this->alias])) { if (isset($this->data[$this->alias])) {
$fields = array_keys($this->data[$this->alias]); $fields = array_keys($this->data[$this->alias]);
} }
if ($options['validate'] && !$this->validates()) { if ($options['validate'] && !$this->validates($options)) {
$this->whitelist = $_whitelist; $this->whitelist = $_whitelist;
return false; return false;
} }
@ -1080,7 +1080,7 @@ class Model extends Overloadable {
} }
if ($options['callbacks'] === true || $options['callbacks'] == 'before') { if ($options['callbacks'] === true || $options['callbacks'] == 'before') {
if (!$this->Behaviors->trigger($this, 'beforeSave', array(), array('break' => true, 'breakOn' => false)) || !$this->beforeSave()) { if (!$this->Behaviors->trigger($this, 'beforeSave', array($options), array('break' => true, 'breakOn' => false)) || !$this->beforeSave($options)) {
$this->whitelist = $_whitelist; $this->whitelist = $_whitelist;
return false; return false;
} }
@ -1157,7 +1157,7 @@ class Model extends Overloadable {
$success = $this->data; $success = $this->data;
} }
if ($options['callbacks'] === true || $options['callbacks'] == 'after') { if ($options['callbacks'] === true || $options['callbacks'] == 'after') {
$this->Behaviors->trigger($this, 'afterSave', array($created)); $this->Behaviors->trigger($this, 'afterSave', array($created, $options));
$this->afterSave($created); $this->afterSave($created);
} }
if (!empty($this->data)) { if (!empty($this->data)) {
@ -1426,7 +1426,7 @@ class Model extends Overloadable {
*/ */
function __save(&$model, $data, $options) { function __save(&$model, $data, $options) {
if ($options['validate'] === 'first' || $options['validate'] === 'only') { if ($options['validate'] === 'first' || $options['validate'] === 'only') {
if (!($model->create($data) && $model->validates())) { if (!($model->create($data) && $model->validates($options))) {
return false; return false;
} }
} elseif (!($model->create(null) !== null && $model->save($data, $options))) { } elseif (!($model->create(null) !== null && $model->save($data, $options))) {
@ -2051,11 +2051,12 @@ class Model extends Overloadable {
/** /**
* Returns true if all fields pass validation, otherwise false. * Returns true if all fields pass validation, otherwise false.
* *
* @param string $options An optional array of custom options to be made available in the beforeValidate callback
* @return boolean True if there are no errors * @return boolean True if there are no errors
* @access public * @access public
*/ */
function validates() { function validates($options = array()) {
$errors = $this->invalidFields(); $errors = $this->invalidFields($options);
if (is_array($errors)) { if (is_array($errors)) {
return count($errors) === 0; return count($errors) === 0;
} }
@ -2064,11 +2065,12 @@ class Model extends Overloadable {
/** /**
* Returns an array of fields that do not meet validation. * Returns an array of fields that do not meet validation.
* *
* @param string $options An optional array of custom options to be made available in the beforeValidate callback
* @return array Array of invalid fields * @return array Array of invalid fields
* @access public * @access public
*/ */
function invalidFields() { function invalidFields($options = array()) {
if (!$this->Behaviors->trigger($this, 'beforeValidate', array(), array('break' => true, 'breakOn' => false)) || $this->beforeValidate() === false) { if (!$this->Behaviors->trigger($this, 'beforeValidate', array($options), array('break' => true, 'breakOn' => false)) || $this->beforeValidate($options) === false) {
return $this->validationErrors; return $this->validationErrors;
} }