mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-03-12 20:49:50 +00:00
adding fix for cleanUpFields
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4634 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
0ae88d6234
commit
6a8092b239
1 changed files with 5 additions and 3 deletions
|
@ -908,11 +908,13 @@ class Controller extends Object {
|
|||
$modelClass = $this->modelClass;
|
||||
}
|
||||
foreach($this->{$modelClass}->_tableInfo->value as $field) {
|
||||
$useNewDate = false;
|
||||
$dateFields = array('Y'=>'_year', 'm'=>'_month', 'd'=>'_day', 'H'=>'_hour', 'i'=>'_min', 's'=>'_sec');
|
||||
foreach ($dateFields as $default => $var) {
|
||||
if(isset($this->data[$modelClass][$field['name'] . $var])) {
|
||||
${$var} = $this->data[$modelClass][$field['name'] . $var];
|
||||
unset($this->data[$modelClass][$field['name'] . $var]);
|
||||
$useNewDate = true;
|
||||
} else {
|
||||
${$var} = date($default);
|
||||
}
|
||||
|
@ -922,11 +924,11 @@ class Controller extends Object {
|
|||
}
|
||||
|
||||
$newDate = null;
|
||||
if ('datetime' == $field['type'] && isset($this->data[$modelClass][$field['name'].'_year'])) {
|
||||
if ('datetime' == $field['type'] && $useNewDate) {
|
||||
$newDate = "{$_year}-{$_month}-{$_day}:{$_hour}:{$_min}:{$_sec}";
|
||||
} else if ('date' == $field['type'] && isset($this->data[$modelClass][$field['name'].'_year'])) {
|
||||
} else if ('date' == $field['type'] && $useNewDate)) {
|
||||
$newDate = "{$_year}-{$_month}-{$_day}";
|
||||
} else if ('time' == $field['type'] && isset($this->data[$modelClass][$field['name'].'_hour'])) {
|
||||
} else if ('time' == $field['type'] && $useNewDate) {
|
||||
$newDate = "{$_hour}:{$_min}:{$_sec}";
|
||||
}
|
||||
if($newDate && !in_array($field['name'], array('created', 'updated', 'modified'))) {
|
||||
|
|
Loading…
Add table
Reference in a new issue