From f5ac7a872e3d766dcbfcae05ca503716ab6a7c31 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Thu, 30 Jun 2016 10:20:21 +0200
Subject: [PATCH] Fix accessing attachments in invitations calendars (#5465)

---
 plugins/calendar/drivers/kolab/kolab_driver.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 6762ad9b..4c21ab8d 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -1652,15 +1652,14 @@ class kolab_driver extends calendar_driver
       $event = $storage->get_event($event['id']);
     }
 
-    if ($event && !empty($event['_attachments'])) {
-      foreach ($event['_attachments'] as $att) {
+    if ($event) {
+      $attachments = isset($event['_attachments']) ? $event['_attachments'] : $event['attachments'];
+      foreach ((array) $attachments as $att) {
         if ($att['id'] == $id) {
           return $att;
         }
       }
     }
-
-    return null;
   }
 
   /**