diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-13 15:06:02 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-13 15:06:02 +0200 |
| commit | 62a86748b58d37bf308f3d747389ead816c5c03c (patch) | |
| tree | f1c62c9ed157739b0a4373506379ffa2fee882df /apps/calendar/ajax | |
| parent | 63a1b066bcebc998bd4a6a4c8cc56f38983b0639 (diff) | |
| parent | 5ac10a9c0eecfa6fe49c314954c506972f275e24 (diff) | |
| download | nextcloud-server-62a86748b58d37bf308f3d747389ead816c5c03c.tar.gz nextcloud-server-62a86748b58d37bf308f3d747389ead816c5c03c.zip | |
Merge branch 'master' into calendar_dropimport
Diffstat (limited to 'apps/calendar/ajax')
| -rwxr-xr-x | apps/calendar/ajax/event/new.form.php | 1 | ||||
| -rwxr-xr-x | apps/calendar/ajax/events.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php index f47cb6c3e2a..91b85fff07f 100755 --- a/apps/calendar/ajax/event/new.form.php +++ b/apps/calendar/ajax/event/new.form.php @@ -57,6 +57,7 @@ $tmpl->assign('repeat_byweekno_options', $repeat_byweekno_options); $tmpl->assign('repeat_bymonthday_options', $repeat_bymonthday_options); $tmpl->assign('repeat_weekofmonth_options', $repeat_weekofmonth_options); +$tmpl->assign('eventid', 'new'); $tmpl->assign('startdate', $start->format('d-m-Y')); $tmpl->assign('starttime', $start->format('H:i')); $tmpl->assign('enddate', $end->format('d-m-Y')); diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php index f149e0d400e..56fa51aaff2 100755 --- a/apps/calendar/ajax/events.php +++ b/apps/calendar/ajax/events.php @@ -15,7 +15,7 @@ OCP\JSON::checkAppEnabled('calendar'); // Look for the calendar id $calendar_id = OC_Calendar_App::getCalendar($_GET['calendar_id'], false, false); if($calendar_id !== false){ - if(! is_numeric($calendar['userid']) && $calendar['userid'] != OCP\User::getUser()){ + if(! is_numeric($calendar_id['userid']) && $calendar_id['userid'] != OCP\User::getUser()){ OCP\JSON::error(); exit; } |