From fe5d9f305b567bc86c36399eccfff47a487e3cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= Date: Fri, 23 Apr 2010 11:03:32 +0000 Subject: [PATCH] Fix iCal export of incomplete events again .-( --- calendar/inc/class.calendar_ical.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index 3668c91948..1d51c1554f 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -244,9 +244,8 @@ class calendar_ical extends calendar_boupdate $recurrence = $this->date2usertime($recur_date); $tzid = null; - if (is_array($event) && empty($event['tzid'])) $event = $event['id']; - - if (!($event = $this->read($event, $recurrence, false, 'server'))) + if ((!is_array($event) || empty($event['tzid']) && ($event = $event['id'])) && + !($event = $this->read($event, $recurrence, false, 'server'))) { if ($this->read($event, $recurrence, true, 'server')) {