From c19bd982334f123d003bab826238548d57b11c84 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Thu, 26 Feb 2015 15:24:22 +0100
Subject: [PATCH] Fix attachment retrieval with direct instance identifiers
 (#4722)

---
 plugins/calendar/drivers/kolab/kolab_calendar.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index bfdaf7b1..6458d054 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -221,7 +221,20 @@ class kolab_calendar extends kolab_storage_folder_api
    */
   public function get_attachment_body($id, $event)
   {
-    return $this->ready ? $this->storage->get_attachment($event['id'], $id): false;
+    if (!$this->ready)
+        return false;
+
+    $data = $this->storage->get_attachment($event['id'], $id);
+
+    if ($data == null) {
+        // try again with master UID
+        $uid = preg_replace('/-\d+(T\d{6})?$/', '', $event['id']);
+        if ($uid != $event['id']) {
+            $data = $this->storage->get_attachment($uid, $id);
+        }
+    }
+
+    return $data;
   }
 
   /**