From ee0e75f28328b7877ed9278e88f84cfbed81ce4e Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 4 Apr 2011 16:09:22 +0000 Subject: [PATCH] Fix for exporting custom fields in user format - CFs are stored as text, not timestamp --- importexport/inc/class.importexport_export_csv.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/importexport/inc/class.importexport_export_csv.inc.php b/importexport/inc/class.importexport_export_csv.inc.php index adecf0049f..7e746d751d 100644 --- a/importexport/inc/class.importexport_export_csv.inc.php +++ b/importexport/inc/class.importexport_export_csv.inc.php @@ -322,11 +322,13 @@ class importexport_export_csv implements importexport_iface_export_record } foreach((array)$fields['date-time'] as $name) { //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 } foreach((array)$fields['date'] as $name) { //if ($record->$name) $record->$name = date('Y-m-d',$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'], $record->$name); // User date format }