summaryrefslogtreecommitdiff
path: root/plugins/calendar
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-02-26 15:25:51 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-02-26 15:25:51 (GMT)
commitd4f819bf94dd5c4f8e397237ddae99ef6de1f474 (patch)
treec6926f5a768f6c32359dc5a6a573a559cf8f4df9 /plugins/calendar
parentfc4cf15b30597085ee4da7f66ad381b2b9e22d2d (diff)
downloadroundcubemail-plugins-kolab-d4f819bf94dd5c4f8e397237ddae99ef6de1f474.tar.gz
Fix deletion of single event occurrences (#4722)
Diffstat (limited to 'plugins/calendar')
-rw-r--r--plugins/calendar/drivers/kolab/kolab_calendar.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index 6458d05..79450af 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -519,13 +519,13 @@ class kolab_calendar extends kolab_storage_folder_api
*/
public function delete_event($event, $force = true)
{
- $deleted = $this->storage->delete($event['id'], $force);
+ $deleted = $this->storage->delete($event['uid'] ?: $event['id'], $force);
if (!$deleted) {
rcube::raise_error(array(
'code' => 600, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Error deleting event object from Kolab server"),
+ 'message' => sprintf("Error deleting event object '%s' from Kolab server", $event['id'])),
true, false);
}