From e0e9ff33a7f5fc334af8127fc8680925ce967d14 Mon Sep 17 00:00:00 2001 From: Kevin Jardine Date: Thu, 2 Feb 2012 16:19:37 +0100 Subject: added support for new personal calendar management options --- actions/event_calendar/add_personal.php | 2 +- actions/event_calendar/addtocalendar.php | 2 +- actions/event_calendar/killrequest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'actions/event_calendar') diff --git a/actions/event_calendar/add_personal.php b/actions/event_calendar/add_personal.php index fd6f6cee2..ed4eb3092 100644 --- a/actions/event_calendar/add_personal.php +++ b/actions/event_calendar/add_personal.php @@ -14,4 +14,4 @@ if (elgg_instanceof($event,'object','event_calendar')) { } } -forward(REFERER); \ No newline at end of file +forward(REFERER); diff --git a/actions/event_calendar/addtocalendar.php b/actions/event_calendar/addtocalendar.php index e5b689d73..0144dfba1 100644 --- a/actions/event_calendar/addtocalendar.php +++ b/actions/event_calendar/addtocalendar.php @@ -11,7 +11,7 @@ $event = get_entity($event_guid); if (elgg_instanceof($event, 'object', 'event_calendar') && elgg_instanceof($user, 'user') - && event_calendar_personal_can_manage($event,$user_guid) + && $event->canEdit() && check_entity_relationship($user_guid, 'event_calendar_request', $event_guid)) { if (event_calendar_add_personal_event($event_guid,$user_guid)) { diff --git a/actions/event_calendar/killrequest.php b/actions/event_calendar/killrequest.php index b58e804cd..f4f3c3135 100644 --- a/actions/event_calendar/killrequest.php +++ b/actions/event_calendar/killrequest.php @@ -11,7 +11,7 @@ $event = get_entity($event_guid); if (elgg_instanceof($event, 'object', 'event_calendar') && elgg_instanceof($user, 'user') - && event_calendar_personal_can_manage($event,$user_guid) + && $event->canEdit() && check_entity_relationship($user_guid, 'event_calendar_request', $event_guid)) { remove_entity_relationship($user->guid, 'event_calendar_request', $event_guid); -- cgit v1.2.3