Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly reset $recurrence_id in a loop

Browse source
This commit is contained in:
Aleksander Machniak 2015-09-29 12:24:45 +02:00
parent 790b5b04f0
commit 21130bf9e6
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/libkolab/lib/kolab_format_event.php
View file

@ -109,6 +109,7 @@ class kolab_format_event extends kolab_format_xcal
$exevent->set(($compacted = $this->compact_exception($exception, $object))); // only save differing values $exevent->set(($compacted = $this->compact_exception($exception, $object))); // only save differing values
// get value for recurrence-id // get value for recurrence-id
$recurrence_id = null;
if (!empty($exception['recurrence_date']) && is_a($exception['recurrence_date'], 'DateTime')) { if (!empty($exception['recurrence_date']) && is_a($exception['recurrence_date'], 'DateTime')) {
$recurrence_id = $exception['recurrence_date']; $recurrence_id = $exception['recurrence_date'];
$compacted['_instance'] = $recurrence_id->format($recurrence_id_format); $compacted['_instance'] = $recurrence_id->format($recurrence_id_format);
@ -117,6 +118,7 @@ class kolab_format_event extends kolab_format_xcal
$recurrence_id = rcube_utils::anytodatetime($exception['_instance'], $object['start']->getTimezone()); $recurrence_id = rcube_utils::anytodatetime($exception['_instance'], $object['start']->getTimezone());
$compacted['recurrence_date'] = $recurrence_id; $compacted['recurrence_date'] = $recurrence_id;
} }
$exevent->obj->setRecurrenceID(self::get_datetime($recurrence_id ?: $exception['start'], null, $object['allday']), (bool)$exception['thisandfuture']); $exevent->obj->setRecurrenceID(self::get_datetime($recurrence_id ?: $exception['start'], null, $object['allday']), (bool)$exception['thisandfuture']);
$vexceptions->push($exevent->obj); $vexceptions->push($exevent->obj);