From 6797ab56d8e382fc0a26f37a436a3c2b893b16db Mon Sep 17 00:00:00 2001 From: Michael J Rubinsky Date: Tue, 29 Jul 2014 12:47:43 -0400 Subject: [PATCH] Bug: 13369 Fix exporting ics when event contains exceptions AND explicit timezone data. --- kronolith/lib/Event.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php index 778c07d7859..b84e98ba884 100644 --- a/kronolith/lib/Event.php +++ b/kronolith/lib/Event.php @@ -714,8 +714,10 @@ public function toiCalendar($calendar) $params = array(); if ($this->timezone) { try { - $tz = $GLOBALS['injector']->getInstance('Horde_Timezone'); - $vEvents[] = $tz->getZone($this->timezone)->toVtimezone(); + if (!$this->baseid) { + $tz = $GLOBALS['injector']->getInstance('Horde_Timezone'); + $vEvents[] = $tz->getZone($this->timezone)->toVtimezone(); + } $params['TZID'] = $this->timezone; } catch (Horde_Exception $e) { Horde::log('Unable to locate the tz database.', 'WARN');