Adapt database driver to this-and-future cancellations from commit 1019238

This commit is contained in:
Thomas Bruederli 2015-03-10 13:54:36 +01:00
parent 10192386dd
commit 738cdb7017

View file

@ -892,6 +892,7 @@ class database_driver extends calendar_driver
$master = $event;
$update_master = false;
$savemode = 'all';
$ret = true;
// read master if deleting a recurring event
if ($event['recurrence'] || $event['recurrence_id']) {
@ -933,6 +934,7 @@ class database_driver extends calendar_driver
$fromdate->format(self::DB_DATE_FORMAT),
$master['id']
);
$ret = $master['id'];
break;
}
// else: future == all if modifying the master event
@ -952,7 +954,7 @@ class database_driver extends calendar_driver
if ($success && $update_master)
$this->_update_event($master, true);
return $success;
return $success ? $ret : false;
}
return false;