diff --git a/importexport/inc/class.importexport_export_csv.inc.php b/importexport/inc/class.importexport_export_csv.inc.php index 0f47875c62..fda7be3a05 100644 --- a/importexport/inc/class.importexport_export_csv.inc.php +++ b/importexport/inc/class.importexport_export_csv.inc.php @@ -177,6 +177,7 @@ class importexport_export_csv implements importexport_iface_export_record public static function convert_parse_custom_fields($appname, &$selects = array(), &$links = array(), &$methods = array()) { if(!$appname) return; + $fields = array(); $custom = config::get_customfields($appname); foreach($custom as $name => $c_field) { $name = '#' . $name; @@ -234,7 +235,7 @@ class importexport_export_csv implements importexport_iface_export_record // Not quite a recursive merge, since only one level foreach($fields as $type => &$list) { if($c_fields[$type]) { - $list += $c_fields[$type]; + $list = array_merge($c_fields[$type], $list);; unset($c_fields[$type]); } } @@ -269,6 +270,11 @@ class importexport_export_csv implements importexport_iface_export_record } } } + foreach((array)$fields['select-bool'] as $name) { + if($record->$name != null) { + $record->$name = $record->$name ? lang('Yes') : lang('No'); + } + } 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 = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] . ', '.