extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-02 20:19:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix iCal export from calendar list view

Browse Source
This commit is contained in:
Jörg Lehrke 2010-04-23 10:34:47 +00:00
parent c5c5330799
commit 4cb30032ba
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/inc/class.calendar_ical.inc.php
View File

@ -183,7 +183,7 @@ class calendar_ical extends calendar_boupdate
/** /**
* Exports one calendar event to an iCalendar item * Exports one calendar event to an iCalendar item
* *
* @param int|array $events (array of) cal_id or array of the events * @param int|array $events (array of) cal_id or array of the events with timestamps in server time
* @param string $version='1.0' could be '2.0' too * @param string $version='1.0' could be '2.0' too
* @param string $method='PUBLISH' * @param string $method='PUBLISH'
* @param int $recur_date=0 if set export the next recurrence at or after the timestamp, * @param int $recur_date=0 if set export the next recurrence at or after the timestamp,
@ -244,8 +244,9 @@ class calendar_ical extends calendar_boupdate
$recurrence = $this->date2usertime($recur_date); $recurrence = $this->date2usertime($recur_date);
$tzid = null; $tzid = null;
if (!is_array($event) if (is_array($event) && empty($event['tzid'])) $event = $event['id'];
&& !($event = $this->read($event, $recurrence, false, 'server')))
if (!($event = $this->read($event, $recurrence, false, 'server')))
{ {
if ($this->read($event, $recurrence, true, 'server')) if ($this->read($event, $recurrence, true, 'server'))
{ {