Fix saving objects without recurrence rule (but previously had recurrence)

This commit is contained in:
Thomas Bruederli 2013-07-04 16:58:18 +02:00
parent 4b72244126
commit ad86770780

View file

@ -286,8 +286,10 @@ abstract class kolab_format_xcal extends kolab_format
}
// save recurrence rule
$rr = new RecurrenceRule;
$rr->setFrequency(RecurrenceRule::FreqNone);
if ($object['recurrence']) {
$rr = new RecurrenceRule;
$rr->setFrequency($this->rrule_type_map[$object['recurrence']['FREQ']]);
if ($object['recurrence']['INTERVAL'])
@ -327,8 +329,6 @@ abstract class kolab_format_xcal extends kolab_format
$rr->setEnd(self::get_datetime($object['recurrence']['UNTIL'], null, true));
if ($rr->isValid()) {
$this->obj->setRecurrenceRule($rr);
// add exception dates (only if recurrence rule is valid)
$exdates = new vectordatetime;
foreach ((array)$object['recurrence']['EXDATE'] as $exdate)
@ -344,6 +344,8 @@ abstract class kolab_format_xcal extends kolab_format
}
}
$this->obj->setRecurrenceRule($rr);
// save alarm
$valarms = new vectoralarm;
if ($object['alarms']) {