upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-25 08:08:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

merge 64a617b2a1 into master

Browse source
This commit is contained in:
Georg Ehrke 2012-02-07 22:49:23 +01:00
parent 89616d81f0
commit cdf1cf82ba
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/calendar/ajax/events.php Normal file → Executable file
View file

@ -39,13 +39,13 @@ foreach($events as $event){
$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
$return_event = array();
$start_dt = $dtstart->getDateTime();
$start_dt->setTimezone(new DateTimeZone($user_timezone));
$end_dt = $dtend->getDateTime();
$end_dt->setTimezone(new DateTimeZone($user_timezone));
if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){
$return_event['allDay'] = true;
}else{
$return_event['allDay'] = false;
$start_dt->setTimezone(new DateTimeZone($user_timezone));
$end_dt->setTimezone(new DateTimeZone($user_timezone));
}
//Repeating Events
if($event['repeating'] == 1){