From 7c2b2d4950f1f5119474626468c193588a281494 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 27 Apr 2016 16:27:04 +0000 Subject: [PATCH] * CalDAV: fix exceptions (EXDATE) was exported with timezone and Zulu-time, causing eM Clinet to fail current Horde_Icalendar only exports EXDATE in Zulu-time, so we can only remove timezone. Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID --- calendar/inc/class.calendar_ical.inc.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index f1d164ea96..cce7cb38d0 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -659,13 +659,9 @@ class calendar_ical extends calendar_boupdate { foreach ($event['recur_exception'] as $key => $timestamp) { - $event['recur_exception'][$key] = self::getDateTime($timestamp,$tzid,$parameters['EXDATE']); - } - if ($version != '1.0') - { - // VALUE=DATE-TIME is default and optional - // adding it causes iCal on iOS 5.1.1 / OSX 10.7.4 to fail to recognice exceptions - if (!empty($tzid)) $parameters['EXDATE']['TZID'] = $tzid; + // current Horde_Icalendar 2.1.4 exports EXDATE always in UTC, so we should not set a timezone here + // Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID + $event['recur_exception'][$key] = self::getDateTime($timestamp,$tzid);//,$parameters['EXDATE']); } } else