aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--models/model.php22
-rw-r--r--views/default/event_calendar/forms/add_to_group.php18
2 files changed, 34 insertions, 6 deletions
diff --git a/models/model.php b/models/model.php
index 04a168e55..dcc9506f3 100644
--- a/models/model.php
+++ b/models/model.php
@@ -491,7 +491,11 @@ function event_calendar_get_entities_from_metadata_between_related($meta_start_n
}
}
$related_list = array();
- $related_events = get_entities_from_relationship("display_on_group", $container_guid, TRUE);
+ $related_events = elgg_get_entities_from_relationship(array(
+ 'relationship' => 'display_on_group',
+ 'relationship_guid' => $container_guid,
+ 'inverse_relationship' => TRUE,
+ ));
if ($related_events) {
foreach ($related_events as $event) {
$related_list[$event->guid] = $event;
@@ -719,7 +723,13 @@ function event_calendar_remove_personal_event($event_id,$user_id) {
}
function event_calendar_get_personal_events_for_user($user_id,$limit) {
- $events = get_entities_from_annotations("object", "event_calendar", "personal_event", $user_id,0, 0, 1000);
+ $events = elgg_get_entities_from_annotations(array(
+ 'type' => 'object',
+ 'subtype' => 'event_calendar',
+ 'annotation_names' => 'personal_event',
+ 'annotation_value' => $user_id,
+ 'limit' => 1000,
+ ));
$final_events = array();
if ($events) {
$now = time();
@@ -759,7 +769,13 @@ function event_calendar_security_fields() {
}
function event_calendar_get_events_for_group($group_guid) {
- return get_entities('object','event_calendar',0,"",0,0,false,0,$group_guid);
+ $options = array(
+ 'type' => 'object',
+ 'subtype' => 'event_calendar',
+ 'container_guid' => $group_guid,
+ 'limit' => 0,
+ );
+ return elgg_get_entities($options);
}
function event_calendar_handle_join($event, $object_type, $object) {
diff --git a/views/default/event_calendar/forms/add_to_group.php b/views/default/event_calendar/forms/add_to_group.php
index fc77495e1..07e2e8b33 100644
--- a/views/default/event_calendar/forms/add_to_group.php
+++ b/views/default/event_calendar/forms/add_to_group.php
@@ -10,16 +10,28 @@ $event_container = $vars['event']->container_guid;
// get the list of all groups:
if (isadminloggedin()) {
- $groups = get_entities("group","",0,"",5000);
+ $groups = elgg_get_entities(array(
+ 'type' => 'group',
+ 'limit' => 5000,
+ ));
} else {
- $groups = get_entities("group","",get_loggedin_userid(),"",5000);
+ $groups = elgg_get_entities(array(
+ 'type' => 'group',
+ 'owner_guid' => get_loggedin_userid(),
+ 'limit' => 5000,
+ ));
}
// split the group list into two lists
$add_options = array();
$remove_options = array();
-$remove_group = get_entities_from_relationship("display_on_group",$event_id,FALSE,"","",0,"",5000);
+$remove_group = elgg_get_entities_from_relationship(array(
+ 'relationship' => 'display_on_group',
+ 'relationship_guid' => $event_id,
+ 'inverse_relationship' => FALSE,
+ 'limit' => 5000,
+));
$remove_group_ids = array();
foreach ($remove_group as $group) {
$remove_group_ids[] = $group->guid;