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

Don't copy recurrence_date to future occurrences

Browse source
This commit is contained in:
Thomas Bruederli 2015-02-15 19:09:10 +01:00
parent dbdce67e1e
commit 8a74dc2d28
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/calendar/calendar.php
View file

@ -1676,6 +1676,7 @@ class calendar extends rcube_plugin
if ($event['recurrence']) {
$event['recurrence_text'] = $this->lib->recurrence_text($event['recurrence']);
$event['recurrence'] = $this->lib->to_client_recurrence($event['recurrence'], $event['allday']);
unset($event['recurrence_date']);
}
foreach ((array)$event['attachments'] as $k => $attachment) {

2
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -661,7 +661,7 @@ class kolab_calendar extends kolab_storage_folder_api
*/
private function _merge_event_data(&$event, $overlay)
{
static $forbidden = array('id','uid','recurrence','organizer','_attachments');
static $forbidden = array('id','uid','recurrence','recurrence_date','organizer','_attachments');
foreach ($overlay as $prop => $value) {
// adjust time of the recurring event instance

1
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -962,6 +962,7 @@ class kolab_driver extends calendar_driver
// save as new exception to master event
if ($add_exception) {
$event['_instance'] = $old['_instance'];
$event['recurrence_date'] = $old['recurrence_date'];
$master['recurrence']['EXCEPTIONS'][] = $event;
}
$success = $storage->update_event($master);