extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

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"

Browse Source
This commit is contained in:
Nathan Gray 2014-08-12 23:19:39 +00:00
parent deeebeb77f
commit f6bca11f4f
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etemplate/inc/class.bo_merge.inc.php
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,