From f0b86e7cbe44f5cfc7c1821710f644999092794b Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 25 Oct 2011 17:18:17 +0000 Subject: [PATCH] Fix 12 hour time format (missing am/pm) when exporting --- importexport/inc/class.importexport_export_csv.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/importexport/inc/class.importexport_export_csv.inc.php b/importexport/inc/class.importexport_export_csv.inc.php index a09160d94b..1da5bbb10e 100644 --- a/importexport/inc/class.importexport_export_csv.inc.php +++ b/importexport/inc/class.importexport_export_csv.inc.php @@ -325,7 +325,7 @@ class importexport_export_csv implements importexport_iface_export_record //if ($record->$name) $record->$name = date('Y-m-d H:i:s',$record->$name); // Standard date format if ($record->$name && !is_numeric($record->$name)) $record->$name = strtotime($record->$name); // Custom fields stored as string if ($record->$name && is_numeric($record->$name)) $record->$name = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] . ', '. - ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '24' ? 'H' : 'h').':i:s',$record->$name); // User date format + ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '24' ? 'H:i:s' : 'h:i:s a'),$record->$name); // User date format } foreach((array)$fields['date'] as $name) { //if ($record->$name) $record->$name = date('Y-m-d',$record->$name); // Standard date format