]> source.dussan.org Git - nextcloud-server.git/commitdiff
apply fix suggested in oc-1132 - bugfix for oc-1132
authorGeorg Ehrke <dev@georgswebsite.de>
Thu, 26 Jul 2012 16:40:12 +0000 (18:40 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Thu, 26 Jul 2012 16:40:12 +0000 (18:40 +0200)
apps/calendar/lib/app.php

index b575f5b9fde38b63d109bf48ce0ec06646f49222..06f85d32250b3f31f770be1ed2f9287e808d0cb0 100644 (file)
@@ -439,7 +439,7 @@ class OC_Calendar_App{
                                        $output['end'] = date('Y-m-d', $result->format('U') + --$duration);
                                }else{
                                        $output['start'] = $result->format('Y-m-d H:i:s');
-                                       $output['end'] = date('Y-m-d H:i:s', $result->format('U') + $duration);
+                                       $output['end'] = date('Y-m-d H:i:s', $result->format('U') + $result->format('Z') + $duration);
                                }
                                $return[] = $output;
                        }