From 949a3f0c2ea1804577ff69d92f811ced71a79976 Mon Sep 17 00:00:00 2001
From: Jerome Bakker <jeabakker@coldtrick.com>
Date: Wed, 3 Oct 2012 14:02:11 +0200
Subject: correct singual usage of type in elgg_get_entities_* functions

---
 engine/lib/deprecated-1.8.php                | 4 ++--
 engine/lib/group.php                         | 2 +-
 engine/lib/notification.php                  | 2 +-
 engine/lib/objects.php                       | 2 +-
 engine/lib/sites.php                         | 2 +-
 engine/lib/users.php                         | 6 +++---
 engine/tests/api/entity_getter_functions.php | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'engine')

diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index 4b9d41543..e967df3dd 100644
--- a/engine/lib/deprecated-1.8.php
+++ b/engine/lib/deprecated-1.8.php
@@ -2566,7 +2566,7 @@ $owner_guid = "", $owner_relationship = "") {
 				'relationship' => $owner_relationship,
 				'relationship_guid' => $owner_guid[0],
 				'inverse_relationship' => FALSE,
-				'types' => 'user',
+				'type' => 'user',
 				'subtypes' => $subtype,
 				'limit' => 9999))
 			) {
@@ -2721,7 +2721,7 @@ function get_site_collections($site_guid, $subtype = "", $limit = 10, $offset =
 		'relationship' => 'member_of_site',
 		'relationship_guid' => $site_guid,
 		'inverse_relationship' => TRUE,
-		'types' => 'collection',
+		'type' => 'collection',
 		'subtypes' => $subtype,
 		'limit' => $limit,
 		'offset' => $offset
diff --git a/engine/lib/group.php b/engine/lib/group.php
index feb1f1e7f..da5fb8656 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -169,7 +169,7 @@ function get_group_members($group_guid, $limit = 10, $offset = 0, $site_guid = 0
 		'relationship' => 'member',
 		'relationship_guid' => $group_guid,
 		'inverse_relationship' => TRUE,
-		'types' => 'user',
+		'type' => 'user',
 		'limit' => $limit,
 		'offset' => $offset,
 		'count' => $count,
diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index 18faff27f..738295588 100644
--- a/engine/lib/notification.php
+++ b/engine/lib/notification.php
@@ -491,7 +491,7 @@ function object_notifications($event, $object_type, $object) {
 					'relationship' => 'notify' . $method,
 					'relationship_guid' => $object->container_guid,
 					'inverse_relationship' => TRUE,
-					'types' => 'user',
+					'type' => 'user',
 					'limit' => 99999
 				));
 
diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index f186c66cb..1dd5c5ec7 100644
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -92,7 +92,7 @@ function get_object_sites($object_guid, $limit = 10, $offset = 0) {
 	return elgg_get_entities_from_relationship(array(
 		'relationship' => 'member_of_site',
 		'relationship_guid' => $object_guid,
-		'types' => 'site',
+		'type' => 'site',
 		'limit' => $limit,
 		'offset' => $offset
 	));
diff --git a/engine/lib/sites.php b/engine/lib/sites.php
index 850092cad..805dacd2d 100644
--- a/engine/lib/sites.php
+++ b/engine/lib/sites.php
@@ -183,7 +183,7 @@ function get_site_objects($site_guid, $subtype = "", $limit = 10, $offset = 0) {
 		'relationship' => 'member_of_site',
 		'relationship_guid' => $site_guid,
 		'inverse_relationship' => TRUE,
-		'types' => 'object',
+		'type' => 'object',
 		'subtypes' => $subtype,
 		'limit' => $limit,
 		'offset' => $offset
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 527eff3cd..7dc6b7c2d 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -301,7 +301,7 @@ function get_user_sites($user_guid, $limit = 10, $offset = 0) {
 		'relationship' => 'member_of_site',
 		'relationship_guid' => $user_guid,
 		'inverse_relationship' => FALSE,
-		'types' => 'site',
+		'type' => 'site',
 		'limit' => $limit,
 		'offset' => $offset,
 	));
@@ -386,7 +386,7 @@ $offset = 0) {
 	return elgg_get_entities_from_relationship(array(
 		'relationship' => 'friend',
 		'relationship_guid' => $user_guid,
-		'types' => 'user',
+		'type' => 'user',
 		'subtypes' => $subtype,
 		'limit' => $limit,
 		'offset' => $offset
@@ -410,7 +410,7 @@ $offset = 0) {
 		'relationship' => 'friend',
 		'relationship_guid' => $user_guid,
 		'inverse_relationship' => TRUE,
-		'types' => 'user',
+		'type' => 'user',
 		'subtypes' => $subtype,
 		'limit' => $limit,
 		'offset' => $offset
diff --git a/engine/tests/api/entity_getter_functions.php b/engine/tests/api/entity_getter_functions.php
index 9db248de9..d255c2e67 100644
--- a/engine/tests/api/entity_getter_functions.php
+++ b/engine/tests/api/entity_getter_functions.php
@@ -2648,7 +2648,7 @@ class ElggCoreEntityGetterFunctionsTest extends ElggCoreUnitTest {
 			$name = 'test_annotation_' . rand(0, 9999);
 			$values = array();
 			$options = array(
-				'types' => 'object',
+				'type' => 'object',
 				'subtypes' => $subtypes,
 				'limit' => 5
 			);
@@ -2687,7 +2687,7 @@ class ElggCoreEntityGetterFunctionsTest extends ElggCoreUnitTest {
 			$order = array_keys($values);
 
 			$options = array(
-				'types' => 'object',
+				'type' => 'object',
 				'subtypes' => $subtypes,
 				'limit' => 5,
 				'annotation_name' => $name,
-- 
cgit v1.2.3