Merge branch '2013.10' into 2014.11
[tine20] / tine20 / Calendar / Model / Event.php
index a43b4d8..eb95ac6 100644 (file)
@@ -513,7 +513,7 @@ class Calendar_Model_Event extends Tinebase_Record_Abstract
                 // NOTE: this is in contrast to the iCal spec which says until should be the
                 //       dtstart of the last occurence. But as the client with the name of the
                 //       spec sets it to the end of the day, we do it also.
-                if ($rrule->until instanceof Tinebase_DateTime) {
+                if ($rrule->until instanceof Tinebase_DateTime && !$this->is_all_day_event) {
                     $rrule->until->setTimezone($this->originator_tz);
                     // NOTE: subSecond cause some clients send 00:00:00 for midnight
                     $rrule->until->subSecond(1)->setTime(23, 59, 59);