From 15ecaec4f402bbf3b3914f22d3e2ad7fe9006bb8 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 30 Jan 2013 15:45:48 +0000 Subject: [PATCH] Get ical export working for scheduled export --- calendar/inc/class.calendar_export_ical.inc.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_export_ical.inc.php b/calendar/inc/class.calendar_export_ical.inc.php index 1d37a2f47a..d7556a9022 100644 --- a/calendar/inc/class.calendar_export_ical.inc.php +++ b/calendar/inc/class.calendar_export_ical.inc.php @@ -28,9 +28,6 @@ class calendar_export_ical extends calendar_export_csv { // Custom fields need to be specifically requested $cfs = array(); - foreach($options['mapping'] as $key => $label) { - if($key[0] == '#') $cfs[] = substr($key,1); - } $limit_exception = bo_merge::is_export_limit_excepted(); if (!$limit_exception) $export_limit = bo_merge::getExportLimit('calendar'); @@ -51,7 +48,8 @@ class calendar_export_ical extends calendar_export_csv { } $events =& $this->bo->search($query); } - elseif ($options['selection'] == 'search_results') + // Scheduled export will use 'all', which we don't allow through UI + elseif ($options['selection'] == 'search_results' || $options['selection'] == 'all') { $states = $GLOBALS['egw']->session->appsession('session_data','calendar'); if($states['view'] == 'listview')