Merge branch 'spidev' into 'master'

Kalender Update

See merge request fronk/thetool!1855

application/Calendar/CalendarModel.php

@@ -659,17 +659,18 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
 
     public static function updateCalendarEvent($r, $me)
     {
+        $description = ($r->description);
+        $attachments = ($r->attachments);
+        $location = ($r->location);
+        $title = ($r->title);
+
         $start = CalendarModel::convertMillisecondsToTimestamp($r->start);
         $end = CalendarModel::convertMillisecondsToTimestamp($r->end);
-
-
         if ($title) {
             $start = strtotime($r->start);
             $end = strtotime($r->end);
         }
-
         $originalend = $end;
-
         $allday = ($r->allday);
         if ($allday) {
             $start = $start + 7200;