diff options
| author | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-10-21 22:47:31 +0200 |
|---|---|---|
| committer | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-10-21 22:47:31 +0200 |
| commit | d50b014aba3296693f3be8829e605a29de207f0c (patch) | |
| tree | b7862dd2c91e3d36cae717d9e3608baae65b8180 /apps/calendar | |
| parent | 92fa6f0a48408d7064b5896d9ee8c9157d3efb12 (diff) | |
| download | nextcloud-server-d50b014aba3296693f3be8829e605a29de207f0c.tar.gz nextcloud-server-d50b014aba3296693f3be8829e605a29de207f0c.zip | |
fix allday bug
Diffstat (limited to 'apps/calendar')
| -rw-r--r-- | apps/calendar/ajax/events.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php index 8f466bee91a..c08c2e67586 100644 --- a/apps/calendar/ajax/events.php +++ b/apps/calendar/ajax/events.php @@ -25,23 +25,26 @@ foreach($events as $event) $dtstart = $vevent->DTSTART; $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent); $start_dt = $dtstart->getDateTime(); - $start_dt->setTimezone(new DateTimeZone($user_timezone)); $end_dt = $dtend->getDateTime(); - $end_dt->setTimezone(new DateTimeZone($user_timezone)); - - $return_event = array(); - $return_event['id'] = $event['id']; - $return_event['title'] = $event['summary']; - $return_event['description'] = isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:''; - $return_event['start'] = $start_dt->format('Y-m-d H:i:s'); - $return_event['end'] = $end_dt->format('Y-m-d H:i:s'); - $return_event['allDay'] = false; if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE) { $return_event['allDay'] = true; + $return_event['start'] = $start_dt->format('Y-m-d'); $end_dt->modify('-1 sec'); + $return_event['end'] = $end_dt->format('Y-m-d'); + }else{ + $start_dt->setTimezone(new DateTimeZone($user_timezone)); + $end_dt->setTimezone(new DateTimeZone($user_timezone)); + $return_event['start'] = $start_dt->format('Y-m-d H:i:s'); $return_event['end'] = $end_dt->format('Y-m-d H:i:s'); + $return_event['allDay'] = false; } + $return_event = array(); + $return_event['id'] = $event['id']; + $return_event['title'] = $event['summary']; + $return_event['description'] = isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:''; + $return_event['start'] = $start_dt->format('Y-m-d H:i:s'); + $return_event['end'] = $end_dt->format('Y-m-d H:i:s'); $return[] = $return_event; } OC_JSON::encodedPrint($return); |