Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 08:53:35 +0000 (10:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 08:53:35 +0000 (10:53 +0200)
1  2 
tine20/Addressbook/Setup/setup.xml
tine20/Calendar/Convert/Event/Json.php
tine20/Calendar/Export/GenericTrait.php

Simple merge
@@@ -87,10 -83,7 +87,9 @@@ trait Calendar_Export_GenericTrai
       */
      protected function _resolveRecords(Tinebase_Record_RecordSet $_records)
      {
 +        parent::_resolveRecords($_records);
 +
          Calendar_Model_Attender::resolveAttendee($_records->attendee, false, $_records);
-         $organizers = Addressbook_Controller_Contact::getInstance()->getMultiple(array_unique($_records->organizer), TRUE);
  
          foreach($_records as $record) {
              $attendee = $record->attendee->getName();