mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-09-07 20:12:42 +00:00
fixing missing passedArgs member in controller that was not committed in [5228], fixing cleanUpFields to not set a default time or date.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5242 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
9402ab76ef
commit
68113a4a9a
1 changed files with 12 additions and 1 deletions
|
@ -267,8 +267,15 @@ class Controller extends Object {
|
|||
* @var unknown_type
|
||||
*/
|
||||
var $webservices = null;
|
||||
/**
|
||||
* Holds all params passed and named.
|
||||
*
|
||||
* @var mixed
|
||||
*/
|
||||
var $passedArgs = array();
|
||||
/**
|
||||
* Set to true to enable named URL parameters (/controller/action/name:value).
|
||||
* Or set an array of actions and default named args: array('action'=> array('name'=>'defaultValue'));
|
||||
*
|
||||
* @var mixed
|
||||
*/
|
||||
|
@ -945,7 +952,11 @@ class Controller extends Object {
|
|||
unset($this->data[$modelClass][$field['name'] . $var]);
|
||||
$useNewDate = true;
|
||||
} else {
|
||||
${$var} = date($default);
|
||||
if($var == 'year') {
|
||||
${$var} = '0000';
|
||||
} else {
|
||||
${$var} = '00';
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($_hour != 12 && (isset($this->data[$modelClass][$field['name'] . '_meridian']) && 'pm' == $this->data[$modelClass][$field['name'] . '_meridian'])) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue