summaryrefslogtreecommitdiffstats
path: root/apps/calendar
diff options
context:
space:
mode:
authorGeorg Ehrke <georg.stefan.germany@googlemail.com>2011-10-21 22:59:26 +0200
committerGeorg Ehrke <georg.stefan.germany@googlemail.com>2011-10-21 22:59:26 +0200
commit433b57c3156cc90410d0242cb098793259bea848 (patch)
treee8803db0e0ff9e641b3f3dba206702723c96f136 /apps/calendar
parentd50b014aba3296693f3be8829e605a29de207f0c (diff)
downloadnextcloud-server-433b57c3156cc90410d0242cb098793259bea848.tar.gz
nextcloud-server-433b57c3156cc90410d0242cb098793259bea848.zip
fix new allday bug
Diffstat (limited to 'apps/calendar')
-rw-r--r--apps/calendar/ajax/events.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index c08c2e67586..5c4cced8d20 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -20,6 +20,7 @@ $user_timezone = OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timez
$return = array();
foreach($events as $event)
{
+ $return_event = array();
$object = Sabre_VObject_Reader::read($event['calendardata']);
$vevent = $object->VEVENT;
$dtstart = $vevent->DTSTART;
@@ -39,12 +40,9 @@ foreach($events as $event)
$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);