From dd6bb235e57618ca3b466ab753195d791a68584b Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Tue, 10 Aug 2010 11:38:38 -0400 Subject: [PATCH] Don't return detached recurrences when exporting to iCalendar. --- kronolith/data.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kronolith/data.php b/kronolith/data.php index 1adb05e3d..6bef8c408 100644 --- a/kronolith/data.php +++ b/kronolith/data.php @@ -103,11 +103,18 @@ case 'export': if (!is_array($calendars)) { $calendars = array($calendars); } + $exportID = Horde_Util::getFormData('exportID'); foreach ($calendars as $cal) { if ($kronolith_driver->calendar != $cal) { $kronolith_driver->open($cal); } - $events[$cal] = $kronolith_driver->listEvents($start, $end, false, false, false, false); + $events[$cal] = $kronolith_driver->listEvents($start, // Start date + $end, // End date + false, // Only return recurrences once + false, // Don't limit to alarms + false, // Don't cache json + false, // Don't add events to all days + ($exportID == Horde_Data::EXPORT_ICALENDAR) ? true : false); // Don't return exception events } if (!$events) { @@ -116,7 +123,6 @@ case 'export': break; } - $exportID = Horde_Util::getFormData('exportID'); switch ($exportID) { case Horde_Data::EXPORT_CSV: $data = array(); -- 2.11.0