Removing deprecated calls to get_entities_from_relationship() from core code.

git-svn-id: http://code.elgg.org/elgg/trunk@6385 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/river.php b/engine/lib/river.php
index 1bc04f36ae571e32cb61e2866fa00cfd6bb8a7bb..74e7322e8879491796347af01b6cc29f046cfd98 100644 (file)
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -336,7 +336,12 @@ function elgg_get_river_items($subject_guid = 0, $object_guid = 0, $subject_rela
                }
        } else {
                if (!is_array($subject_guid)) {
-                       if ($entities = get_entities_from_relationship($subject_relationship,$subject_guid,false,'','',0,'',9999)) {
+                       $entities = elgg_get_entities_from_relationship(array(
+                               'relationship' => $subject_relationship,
+                               'relationship_guid' => $subject_guid,
+                               'limit' => 9999,
+                       ));
+                       if (is_array($entities) && !empty($entities)) {
                                $guids = array();
                                foreach($entities as $entity) {
                                        $guids[] = (int) $entity->guid;

diff --git a/mod/groups/views/default/widgets/a_users_groups/view.php b/mod/groups/views/default/widgets/a_users_groups/view.php
index 687ba7251fd8b9da7586d7a0e9df40c3300c2dd6..ec74443ffb651c17814276e76581db4944687d1c 100644 (file)
--- a/mod/groups/views/default/widgets/a_users_groups/view.php
+++ b/mod/groups/views/default/widgets/a_users_groups/view.php
@@ -13,9 +13,12 @@ if (!$number) {
 //the page owner
 $owner = $vars['entity']->owner_guid;
 
-//$groups = get_users_membership($owner);
-//$groups = list_entities_from_relationship('member',$owner,false,'group','',0,$number,false,false,false);
-$groups = get_entities_from_relationship('member', $owner, false, "group", "", 0, "", $number, 0, false, 0);
+$groups = elgg_get_entities_from_relationship(array(
+       'relationship' => 'member',
+       'relationship_guid' => $owner,
+       'types' => 'group',
+       'limit' => $number,
+));
 
 
 if ($groups) {