holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests 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-26 14:33:27 +00:00
parent 90ec79834b
commit 3b80346c3a
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

@ -927,7 +927,8 @@ abstract class bo_merge
{ {
if($value = $replacements['$$'.$field.'$$']) 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) : '';
} }
} }
} }