aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-07 15:52:51 +0000
committernickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-07 15:52:51 +0000
commit79050bf219e6bb45cb4971ac2a2ef841c8a3429d (patch)
tree3ef9b1137be26158ebfacc0378624d26e53ebbfd
parente3bbb00edb615ead64cec9e81f517a51fa64e4b9 (diff)
downloadelgg-79050bf219e6bb45cb4971ac2a2ef841c8a3429d.tar.gz
elgg-79050bf219e6bb45cb4971ac2a2ef841c8a3429d.tar.bz2
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
-rw-r--r--engine/lib/river.php7
-rw-r--r--mod/groups/views/default/widgets/a_users_groups/view.php9
2 files changed, 12 insertions, 4 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 1bc04f36a..74e7322e8 100644
--- 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 687ba7251..ec74443ff 100644
--- 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) {