From aa724afc03587f09792f6723dbb9ff8e73077d43 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 25 May 2015 15:34:41 +0000 Subject: [PATCH] Some date formatting options could not be automatically parsed, so explicitly use user's date & time settings. Fixes intermittent automatic {{timestamp/date}} placeholder. --- etemplate/inc/class.bo_merge.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php index 9c29deb131..ef99f40765 100644 --- a/etemplate/inc/class.bo_merge.inc.php +++ b/etemplate/inc/class.bo_merge.inc.php @@ -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) : ''; } } }