diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-02 08:32:27 -0400 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-02 08:32:27 -0400 |
| commit | 72a43b39291046637c17071c6bb48510ae1c7826 (patch) | |
| tree | f7523181e5015e7a24882189dc83f026c5737812 /apps/calendar | |
| parent | 0fd8b1a04430fc36bd62a0828530dc2bc3910e81 (diff) | |
| download | nextcloud-server-72a43b39291046637c17071c6bb48510ae1c7826.tar.gz nextcloud-server-72a43b39291046637c17071c6bb48510ae1c7826.zip | |
revert 0fd8b1a04430fc36bd62a0828530dc2bc3910e81
Diffstat (limited to 'apps/calendar')
| -rwxr-xr-x | apps/calendar/ajax/events.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php index 94c05f58088..196b2c3394f 100755 --- a/apps/calendar/ajax/events.php +++ b/apps/calendar/ajax/events.php @@ -1,13 +1,12 @@ <?php /** - * Copyright (c) 2011, 2012 Georg Ehrke <ownclouddev at georgswebsite dot de> + * Copyright (c) 2011 Georg Ehrke <ownclouddev at georgswebsite dot de> * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. */ require_once ('../../../lib/base.php'); -//IS THERE A NATIVE SUPPORT IN SABREDAV ??? require_once('when/When.php'); OC_JSON::checkLoggedIn(); @@ -44,7 +43,14 @@ if($_GET['calendar_id'] == 'shared_rw' || $_GET['calendar_id'] == 'shared_r'){ $user_timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get()); $return = array(); foreach($events as $event){ - $return_event = OC_Calendar_App::prepareForOutput($event); + if (isset($event['calendardata'])) { + $object = OC_VObject::parse($event['calendardata']); + $vevent = $object->VEVENT; + } else { + $vevent = $event['vevent']; + } + + $return_event = OC_Calendar_App::prepareForOutput($event, $vevent); $dtstart = $vevent->DTSTART; $start_dt = $dtstart->getDateTime(); |