Merge branch 'pu/2013.10-caldav' into 2014.09
[tine20] / tine20 / Calendar / Controller / Event.php
index 5059dfc..c559bbe 100644 (file)
@@ -196,10 +196,10 @@ class Calendar_Controller_Event extends Tinebase_Controller_Record_Abstract impl
         }
         
         // send notifications
-        if ($this->_sendNotifications) {
+        if ($this->_sendNotifications && $_record['mute'] != 1) {
             $this->doSendNotifications($createdEvent, Tinebase_Core::getUser(), 'created');
-        }
-        
+        }        
+
         return $createdEvent;
     }
     
@@ -1935,6 +1935,17 @@ class Calendar_Controller_Event extends Tinebase_Controller_Record_Abstract impl
         $this->_increaseDisplayContainerContentSequence($attender, $event, Tinebase_Model_ContainerContent::ACTION_CREATE);
     }
     
+        
+    /**
+     * returns the default calendar
+     * 
+     * @return Tinebase_Model_Container
+     */
+    public function getDefaultCalendar()
+    {
+        return Tinebase_Container::getInstance()->getDefaultContainer($this->_applicationName, NULL, Calendar_Preference::DEFAULTCALENDAR);
+    }
+    
     /**
      * returns default displayContainer id of given attendee
      *