Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Sep 2016 12:57:28 +0000 (14:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Sep 2016 12:57:28 +0000 (14:57 +0200)
Change-Id: Ie24f45eb7cf9febf02d5bb39b6870dc183986f9c

1  2 
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tine20/Calendar/Frontend/ActiveSync.php
tine20/Calendar/Model/Attender.php
tine20/Tinebase/User.php

@@@ -443,6 -371,19 +443,19 @@@ class Calendar_Model_Attender extends T
                      }
                  }
  
 -                    }
+                 // does a list with this id exist?
+                 if (! $attendeeId) {
+                     try {
+                         $group = Tinebase_Group::getInstance()->getGroupById($newAttendee['email']);
+                         if ($group) {
+                             $newAttendee['userType'] = Calendar_Model_Attender::USERTYPE_GROUP;
+                             $attendeeId = $group->getId();
+                         }
+                     } catch (Exception $e) {
+                         // do nothing
+                     }
++                }
                  if (! $attendeeId) {
                      // autocreate a contact if allowed
                      $contact = self::resolveEmailToContact($newAttendee, $_implicitAddMissingContacts);
Simple merge