diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-07-26 18:40:12 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-07-26 18:40:12 +0200 |
| commit | d8aca0c78e729e92a1e09c07b707d8718d81c29b (patch) | |
| tree | ad20d613aa077c3b4209b0c40e6a81a0d5c87c28 | |
| parent | 4e62e121a6222cce64f20ab6fa1bbfb77b4a559c (diff) | |
| download | nextcloud-server-d8aca0c78e729e92a1e09c07b707d8718d81c29b.tar.gz nextcloud-server-d8aca0c78e729e92a1e09c07b707d8718d81c29b.zip | |
apply fix suggested in oc-1132 - bugfix for oc-1132
| -rw-r--r-- | apps/calendar/lib/app.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php index b575f5b9fde..06f85d32250 100644 --- a/apps/calendar/lib/app.php +++ b/apps/calendar/lib/app.php @@ -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; } |