Page MenuHomePhorge
Files F118079389

D203.1775612203.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D203.1775612203.diff
View Options

diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -612,14 +612,8 @@
// determine a reasonable end date if none given
if (!$end) {
- switch ($event['recurrence']['FREQ']) {
- case 'YEARLY': $intvl = 'P100Y'; break;
- case 'MONTHLY': $intvl = 'P20Y'; break;
- default: $intvl = 'P10Y'; break;
- }
-
$end = clone $event['start'];
- $end->add(new DateInterval($intvl));
+ $end->add(new DateInterval('P100Y'));
}
// copy the recurrence rule from the master event (to be used in the UI)
@@ -708,7 +702,7 @@
break;
// avoid endless recursion loops
- if (++$i > 1000)
+ if (++$i > 100000)
break;
}
diff --git a/plugins/libkolab/lib/kolab_date_recurrence.php b/plugins/libkolab/lib/kolab_date_recurrence.php
--- a/plugins/libkolab/lib/kolab_date_recurrence.php
+++ b/plugins/libkolab/lib/kolab_date_recurrence.php
@@ -130,14 +130,8 @@
// determine a reasonable end date if none given
if (!$event['recurrence']['COUNT'] && $event['end'] instanceof DateTime) {
- switch ($event['recurrence']['FREQ']) {
- case 'YEARLY': $intvl = 'P100Y'; break;
- case 'MONTHLY': $intvl = 'P20Y'; break;
- default: $intvl = 'P10Y'; break;
- }
-
$end_dt = clone $event['end'];
- $end_dt->add(new DateInterval($intvl));
+ $end_dt->add(new DateInterval('P100Y'));
return $end_dt;
}
diff --git a/plugins/libkolab/lib/kolab_storage_cache_event.php b/plugins/libkolab/lib/kolab_storage_cache_event.php
--- a/plugins/libkolab/lib/kolab_storage_cache_event.php
+++ b/plugins/libkolab/lib/kolab_storage_cache_event.php
@@ -40,7 +40,7 @@
// extend date range for recurring events
if ($object['recurrence'] && $object['_formatobj']) {
$recurrence = new kolab_date_recurrence($object['_formatobj']);
- $dtend = $recurrence->end() ?: new DateTime('now +10 years');
+ $dtend = $recurrence->end() ?: new DateTime('now +100 years');
$sql_data['dtend'] = $this->_convert_datetime($dtend);
}

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 8, 1:36 AM (11 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18845105
Default Alt Text
D203.1775612203.diff (2 KB)

Event Timeline