From f6bca11f4fd9dc6c6a3e15a586ff7a51140a6443 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 12 Aug 2014 23:19:39 +0000 Subject: [PATCH] Add an additional format to parse times in the formatY-m-dTH:m:s for insertion into spreadsheets, fixes warning when merge printing "Unable to parse date ... left as text" --- etemplate/inc/class.bo_merge.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php index 16419e7bc2..263a01c8b5 100644 --- a/etemplate/inc/class.bo_merge.inc.php +++ b/etemplate/inc/class.bo_merge.inc.php @@ -1133,6 +1133,7 @@ abstract class bo_merge // Some different formats dates could be in, depending what they've been through $formats = array( '!'.egw_time::$user_dateformat . ' ' .egw_time::$user_timeformat.':s', + '!'.egw_time::$user_dateformat . '*' .egw_time::$user_timeformat.':s', '!'.egw_time::$user_dateformat . '* ' .egw_time::$user_timeformat, '!'.egw_time::$user_dateformat . '*', '!'.egw_time::$user_dateformat,