Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 1 Sep 2015 12:25:53 +0000 (14:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 1 Sep 2015 12:25:53 +0000 (14:25 +0200)
tine20/Calendar/Controller/MSEventFacade.php

index d5fc199..183cf0a 100644 (file)
@@ -55,7 +55,9 @@ class Calendar_Controller_MSEventFacade implements Tinebase_Controller_Record_In
     private static $_instance = NULL;
     
     protected static $_attendeeEmailCache = array();
-    
+
+    protected $_currentEventFacadeContainer;
+
     /**
      * the constructor
      *
@@ -411,12 +413,15 @@ class Calendar_Controller_MSEventFacade implements Tinebase_Controller_Record_In
         if ($ownAttender) {
             $currentEvent = $this->_eventController->get($event->id);
             $currentAttender = Calendar_Model_Attender::getAttendee($currentEvent->attendee, $ownAttender);
-            $ownAttender->status_authkey = $currentAttender->status_authkey;
+            if ($currentAttender) {
+                $ownAttender->status_authkey = $currentAttender->status_authkey;
+            } else {
+                if (Tinebase_Core::isLogLevel(Zend_Log::NOTICE)) Tinebase_Core::getLogger()->notice(__METHOD__ . '::' . __LINE__
+                    . ' currentAttender not found in currentEvent: ' . print_r($currentEvent->toArray(), true));
+            }
         }
     }
     
-    protected $_currentEventFacadeContainer;
-    
     /**
      * asserts correct event filter and calendar user in MSEventFacade
      *