summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2013-06-24 10:54:02 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2013-06-24 10:54:02 (GMT)
commite0e9dc290005f8b58e1c9153b8905cce277b823b (patch)
treef14d31efa1c60efe0f81474989a99f021dc7521a /plugins
parentc305701742e62dda384f7e1e71239f66999bdd83 (diff)
downloadroundcubemail-plugins-kolab-e0e9dc290005f8b58e1c9153b8905cce277b823b.tar.gz
Revert "Set savemode to 'current' for recurrence exceptions (#1725)"
This reverts commit 6719e1053dadb0d0fb6e74718233771becaf14db.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/calendar/calendar_ui.js2
-rw-r--r--plugins/calendar/drivers/kolab/kolab_calendar.php1
2 files changed, 1 insertions, 2 deletions
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 4626414..ddccd6d 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -524,7 +524,7 @@ function rcube_calendar_ui(settings)
// show warning if editing a recurring event
if (event.id && event.recurrence) {
- var sel = event.thisandfuture ? 'future' : (event.isexception ? 'current' : 'all');
+ var sel = event.thisandfuture ? 'future' : 'all';
$('#edit-recurring-warning').show();
$('input.edit-recurring-savemode[value="'+sel+'"]').prop('checked', true);
}
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index ce6e0ec..e5af7b0 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -434,7 +434,6 @@ class kolab_calendar
$rec_event['recurrence_id'] = $event['uid'];
$rec_event['recurrence'] = $recurrence_rule;
$rec_event['_instance'] = $i;
- $rec_event['isexception'] = 1;
$events[] = $rec_event;
// found the specifically requested instance, exiting...