extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

do not convert empty values, otherwise we will get current date or 1970-01-01 instead

Browse Source
This commit is contained in:
Ralf Becker 2014-10-07 10:19:21 +00:00
parent 21a1f6ea64
commit cf96d4e82d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/inc/class.etemplate_widget_date.inc.php
View File

@ -65,7 +65,7 @@ class etemplate_widget_date extends etemplate_widget_transformer
$form_name = self::form_name($cname, $this->id, $expand);
$value =& self::get_array(self::$request->content, $form_name, false, true);
if($this->type != 'date-duration' && $value)
{
$value = $this->format_date($value);
@ -101,6 +101,8 @@ class etemplate_widget_date extends etemplate_widget_transformer
*/
public function format_date($value)
{
if (!$value) return $value; // otherwise we will get current date or 1970-01-01 instead of an empty value
if ($this->attrs['dataformat'] && !is_numeric($value))
{
$date = date_create_from_format($this->attrs['dataformat'], $value, egw_time::$user_timezone);
@ -120,7 +122,7 @@ class etemplate_widget_date extends etemplate_widget_transformer
}
return $value;
}
/**
* Validate input
*