diff --git a/calendar/inc/class.calendar_wizard_export_csv.inc.php b/calendar/inc/class.calendar_wizard_export_csv.inc.php index a2967ee591..03b1f17647 100644 --- a/calendar/inc/class.calendar_wizard_export_csv.inc.php +++ b/calendar/inc/class.calendar_wizard_export_csv.inc.php @@ -16,6 +16,11 @@ class calendar_wizard_export_csv extends importexport_wizard_basic_export_csv // Field mapping $bo = new calendar_tracking(); $this->export_fields = array('id' => 'Calendar ID') + $bo->field2label; + + // These are not valid: + unset($this->export_fields['participants-c']); + unset($this->export_fields['participants-r']); + $custom = config::get_customfields('calendar', true); foreach($custom as $name => $data) { $this->export_fields['#'.$name] = $data['label']; diff --git a/calendar/setup/importexport_default.xml b/calendar/setup/importexport_default.xml index da8f25f8df..8e8234054f 100644 --- a/calendar/setup/importexport_default.xml +++ b/calendar/setup/importexport_default.xml @@ -33,7 +33,6 @@ start end Participants: User, Status, Role - Participants: User, Status, Quantity, Role calendar ;