Add an additional format to parse times in the formatY-m-dTHⓂ️s for insertion into spreadsheets, fixes warning when merge printing "Unable to parse date ... left as text"

This commit is contained in:
Ralf Becker 2014-08-22 12:26:24 +00:00
parent f5ab5de2b4
commit 8c43c2847d

View File

@ -1133,6 +1133,7 @@ abstract class bo_merge
// Some different formats dates could be in, depending what they've been through // Some different formats dates could be in, depending what they've been through
$formats = array( $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.':s',
'!'.egw_time::$user_dateformat . '* ' .egw_time::$user_timeformat, '!'.egw_time::$user_dateformat . '* ' .egw_time::$user_timeformat,
'!'.egw_time::$user_dateformat . '*', '!'.egw_time::$user_dateformat . '*',
'!'.egw_time::$user_dateformat, '!'.egw_time::$user_dateformat,