summaryrefslogtreecommitdiff
path: root/plugins/calendar
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-03-10 12:54:36 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-03-10 12:54:36 (GMT)
commit738cdb70176e67e6d4cc0635e7a9e261e26af1c9 (patch)
tree9c351941b6fcef737bf87e826ce20b658e44bc3c /plugins/calendar
parent10192386ddc6f345a154f965234273048b986ff1 (diff)
downloadroundcubemail-plugins-kolab-738cdb70176e67e6d4cc0635e7a9e261e26af1c9.tar.gz
Adapt database driver to this-and-future cancellations from commit 1019238
Diffstat (limited to 'plugins/calendar')
-rw-r--r--plugins/calendar/drivers/database/database_driver.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index 2b18352..14a8891 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -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;