extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 17:19:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Infolog - Fix merging empty custom date fields filled them with current date

Browse Source
This commit is contained in:
nathangray 2018-02-01 10:44:17 -07:00
parent 189de3ddda
commit 9bfe20b008
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infolog/inc/class.infolog_merge.inc.php
View File

@ -114,7 +114,7 @@ class infolog_merge extends Api\Storage\Merge
$array['#'.$name] = ''; $array['#'.$name] = '';
} }
// Format date cfs per user Api\Preferences // Format date cfs per user Api\Preferences
if($field['type'] == 'date' || $field['type'] == 'date-time') if($array['#'.$name] && ($field['type'] == 'date' || $field['type'] == 'date-time'))
{ {
$this->date_fields[] = '#'.$name; $this->date_fields[] = '#'.$name;
$array['#'.$name] = Api\DateTime::to($array['#'.$name], $field['type'] == 'date' ? true : ''); $array['#'.$name] = Api\DateTime::to($array['#'.$name], $field['type'] == 'date' ? true : '');