plugins/libkolab
Thomas Brüderli
bruederli at kolabsys.com
Thu Jul 4 16:59:05 CEST 2013
plugins/libkolab/lib/kolab_format_xcal.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit ad8677078007de25d3e81508c3a11990ec23fdce
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Thu Jul 4 16:58:18 2013 +0200
Fix saving objects without recurrence rule (but previously had recurrence)
diff --git a/plugins/libkolab/lib/kolab_format_xcal.php b/plugins/libkolab/lib/kolab_format_xcal.php
index 24f8237..ff10a10 100644
--- a/plugins/libkolab/lib/kolab_format_xcal.php
+++ b/plugins/libkolab/lib/kolab_format_xcal.php
@@ -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']) {
More information about the commits
mailing list