extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 17:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some date formatting options could not be automatically parsed, so explicitly use user's date & time settings.

Browse Source 
Fixes intermittent automatic {{timestamp/date}} placeholder.
This commit is contained in:
Nathan Gray 2015-05-25 15:34:41 +00:00
parent 6841ad3d5d
commit aa724afc03
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etemplate/inc/class.bo_merge.inc.php
View File

@ -933,7 +933,8 @@ abstract class bo_merge
{
if($value = $replacements['$$'.$field.'$$'])
{
$replacements['$$'.$field.'/date$$'] = egw_time::to($value,true);
$time = egw_time::createFromFormat('+'.egw_time::$user_dateformat.' '.egw_time::$user_timeformat.'*', $value);
$replacements['$$'.$field.'/date$$'] = $time ? $time->format(egw_time::$user_dateformat) : '';
}
}
}