diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-02-07 22:49:23 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-02-07 22:49:23 +0100 |
| commit | cdf1cf82baef9764b3211017e7c3e63fb10676d3 (patch) | |
| tree | 4d069f8abd2fdabe6884939ff144ee7a212e320c /apps | |
| parent | 89616d81f0b5a54cd9ef514395c2672cb12233d0 (diff) | |
| download | nextcloud-server-cdf1cf82baef9764b3211017e7c3e63fb10676d3.tar.gz nextcloud-server-cdf1cf82baef9764b3211017e7c3e63fb10676d3.zip | |
merge 64a617b2a1016108c946cc533875a40030bbd317 into master
Diffstat (limited to 'apps')
| -rwxr-xr-x[-rw-r--r--] | apps/calendar/ajax/events.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php index 75fac6838d7..dd593ddec99 100644..100755 --- a/apps/calendar/ajax/events.php +++ b/apps/calendar/ajax/events.php @@ -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){ |