adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changing Model::$whitelist to filter fields in Model::save() instead of Model::set() (Ticket #3437)

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6120 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-12-06 15:21:05 +00:00
parent 872dfbfcef
commit d9f713fefc
1 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -806,21 +806,19 @@ class Model extends Overloadable {
if (is_array($v)) {
foreach ($v as $x => $y) {
if (empty($this->whitelist) || (in_array($x, $this->whitelist) || $n !== $this->alias)) {
if (isset($this->validationErrors[$x])) {
unset ($this->validationErrors[$x]);
}
if ($n === $this->alias) {
if ($x === $this->primaryKey) {
$this->id = $y;
}
}
if (is_array($y) || is_object($y)) {
$y = $this->deconstruct($x, $y);
}
$this->data[$n][$x] = $y;
if (isset($this->validationErrors[$x])) {
unset ($this->validationErrors[$x]);
}
if ($n === $this->alias) {
if ($x === $this->primaryKey) {
$this->id = $y;
}
}
if (is_array($y) || is_object($y)) {
$y = $this->deconstruct($x, $y);
}
$this->data[$n][$x] = $y;
}
}
}
@ -1098,19 +1096,25 @@ class Model extends Overloadable {
}
}
$exists = $this->exists();
$dateFields = array('modified', 'updated');
if (!$exists) {
$dateFields[] = 'created';
}
if (isset($this->data[$this->alias])) {
$fields = array_keys($this->data[$this->alias]);
}
if (!$exists && $this->hasField('created') && !in_array('created', $fields)) {
$colType = am(array('formatter' => 'date'), $db->columns[$this->getColumnType('created')]);
$this->set('created', $colType['formatter']($colType['format']));
}
foreach (array('modified', 'updated') as $updateCol) {
foreach ($dateFields as $updateCol) {
if ($this->hasField($updateCol) && !in_array($updateCol, $fields)) {
$colType = am(array('formatter' => 'date'), $db->columns[$this->getColumnType($updateCol)]);
$this->set($updateCol, $colType['formatter']($colType['format']));
if (!array_key_exists('formatter', $colType) || !array_key_exists('format', $colType)) {
$time = strtotime('now');
} else {
$time = $colType['formatter']($colType['format']);
}
$this->set($updateCol, $time);
}
}
@ -1148,7 +1152,7 @@ class Model extends Overloadable {
}
foreach ($v as $x => $y) {
if ($this->hasField($x)) {
if ($this->hasField($x) && (empty($this->whitelist) || in_array($x, $this->whitelist))) {
$fields[] = $x;
$values[] = $y;
}