Merge branch 'spidev' into 'master'

Bugfix Calender Update sync richtung MS

See merge request fronk/thetool!1697

application/Calendar/CalendarModel.php

@@ -650,11 +650,14 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
         $start = ((($r->start - 7200000) / 1000));
         $end = ((($r->end - 7200000) / 1000));
 
-        $originalend = $end;
+
         if ($title) {
             $start = strtotime($r->start);
             $end = strtotime($r->end);
         }
+
+        $originalend = $end;
+
         $allday = ($r->allday);
         if ($allday) {
             $start = $start + 7200;
@@ -804,8 +807,6 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
                     $db->delete("tmp_cal_events_attachments", "id = '" . $tmpid . "'");
                 }
             }
-
-
             $updateArray['attachments'] = $attachments;
             $updateArray['end_time'] = $originalend;
         }