correct singual usage of type in elgg_get_entities_* functions

25 files changed, 30 insertions, 30 deletions

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,
diff --git a/mod/custom_index/index.php b/mod/custom_index/index.php
index 53990a006..05771f576 100644
--- a/mod/custom_index/index.php
+++ b/mod/custom_index/index.php
@@ -31,7 +31,7 @@ $files = elgg_list_entities($list_params);
 //get the newest members who have an avatar
 $newest_members = elgg_list_entities_from_metadata(array(
 	'metadata_names' => 'icontime',
-	'types' => 'user',
+	'type' => 'user',
 	'limit' => 10,
 	'full_view' => false,
 	'pagination' => false,
diff --git a/mod/file/pages/file/owner.php b/mod/file/pages/file/owner.php
index fb87af1b2..1409a404e 100644
--- a/mod/file/pages/file/owner.php
+++ b/mod/file/pages/file/owner.php
@@ -36,7 +36,7 @@ $title = elgg_echo("file:user", array($owner->name));
 
 // List files
 $content = elgg_list_entities(array(
-	'types' => 'object',
+	'type' => 'object',
 	'subtypes' => 'file',
 	'container_guid' => $owner->guid,
 	'limit' => 10,
diff --git a/mod/file/pages/file/search.php b/mod/file/pages/file/search.php
index 402a28933..35f8a7db7 100644
--- a/mod/file/pages/file/search.php
+++ b/mod/file/pages/file/search.php
@@ -74,7 +74,7 @@ if ($listtype == "gallery") {
 }
 
 $params = array(
-	'types' => 'object',
+	'type' => 'object',
 	'subtypes' => 'file',
 	'container_guid' => $page_owner_guid,
 	'limit' => $limit,
diff --git a/mod/file/pages/file/world.php b/mod/file/pages/file/world.php
index 770dfd6e8..8cf8ad138 100644
--- a/mod/file/pages/file/world.php
+++ b/mod/file/pages/file/world.php
@@ -14,7 +14,7 @@ $limit = get_input("limit", 10);
 $title = elgg_echo('file:all');
 
 $content = elgg_list_entities(array(
-	'types' => 'object',
+	'type' => 'object',
 	'subtypes' => 'file',
 	'limit' => $limit,
 	'full_view' => FALSE
diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php
index 505cacd01..a9eb6e843 100644
--- a/mod/groups/lib/groups.php
+++ b/mod/groups/lib/groups.php
@@ -79,7 +79,7 @@ function groups_search_page() {
 	$params = array(
 		'metadata_name' => 'interests',
 		'metadata_value' => $tag,
-		'types' => 'group',
+		'type' => 'group',
 		'full_view' => FALSE,
 	);
 	$content = elgg_list_entities_from_metadata($params);
@@ -351,7 +351,7 @@ function groups_handle_members_page($guid) {
 		'relationship' => 'member',
 		'relationship_guid' => $group->guid,
 		'inverse_relationship' => true,
-		'types' => 'user',
+		'type' => 'user',
 		'limit' => 20,
 	));
 
diff --git a/mod/groups/start.php b/mod/groups/start.php
index c591410c5..9689802eb 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -979,7 +979,7 @@ function discussion_reply_notifications($event, $type, $annotation) {
 				'relationship' => 'notify' . $method,
 				'relationship_guid' => $topic->getContainerGUID(),
 				'inverse_relationship' => true,
-				'types' => 'user',
+				'type' => 'user',
 				'limit' => 0,
 			));
 
diff --git a/mod/groups/views/default/groups/sidebar/featured.php b/mod/groups/views/default/groups/sidebar/featured.php
index 8bd51ab5c..f3f8f8d2d 100644
--- a/mod/groups/views/default/groups/sidebar/featured.php
+++ b/mod/groups/views/default/groups/sidebar/featured.php
@@ -8,7 +8,7 @@
 $featured_groups = elgg_get_entities_from_metadata(array(
 	'metadata_name' => 'featured_group',
 	'metadata_value' => 'yes',
-	'types' => 'group',
+	'type' => 'group',
 	'limit' => 10,
 ));
 
diff --git a/mod/groups/views/default/groups/sidebar/members.php b/mod/groups/views/default/groups/sidebar/members.php
index 11273d0e6..1199a0c34 100644
--- a/mod/groups/views/default/groups/sidebar/members.php
+++ b/mod/groups/views/default/groups/sidebar/members.php
@@ -20,7 +20,7 @@ $body = elgg_list_entities_from_relationship(array(
 	'relationship' => 'member',
 	'relationship_guid' => $vars['entity']->guid,
 	'inverse_relationship' => true,
-	'types' => 'user',
+	'type' => 'user',
 	'limit' => $limit,
 	'list_type' => 'gallery',
 	'gallery_class' => 'elgg-gallery-users',
diff --git a/mod/notifications/actions/groupsave.php b/mod/notifications/actions/groupsave.php
index 7838f7e63..c646c1885 100644
--- a/mod/notifications/actions/groupsave.php
+++ b/mod/notifications/actions/groupsave.php
@@ -21,7 +21,7 @@ $groups = array();
 $options = array(
 	'relationship' => 'member',
 	'relationship_guid' => $user->guid,
-	'types' => 'group',
+	'type' => 'group',
 	'limit' => 9999,
 );
 if ($groupmemberships = elgg_get_entities_from_relationship($options)) {
diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index 3347d4054..d29c43e1f 100644
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -28,7 +28,7 @@ $people = array();
 $groupmemberships = elgg_get_entities_from_relationship(array(
 	'relationship' => 'member',
 	'relationship_guid' => $user->guid,
-	'types' => 'group',
+	'type' => 'group',
 	'limit' => 9999,
 ));
 
diff --git a/mod/notifications/index.php b/mod/notifications/index.php
index cd1857f04..ff03cb274 100644
--- a/mod/notifications/index.php
+++ b/mod/notifications/index.php
@@ -27,7 +27,7 @@ $people = array();
 if ($people_ents = elgg_get_entities_from_relationship(array(
 		'relationship' => 'notify',
 		'relationship_guid' => $user->guid,
-		'types' => 'user',
+		'type' => 'user',
 		'limit' => 99999,
 	))) {
 	
diff --git a/mod/notifications/views/default/forms/notificationsettings/groupsave.php b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
index 168639ab2..64db8f533 100644
--- a/mod/notifications/views/default/forms/notificationsettings/groupsave.php
+++ b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
@@ -15,7 +15,7 @@ foreach ($NOTIFICATION_HANDLERS as $method => $foo) {
 	$subsbig[$method] = elgg_get_entities_from_relationship(array(
 		'relationship' => 'notify' . $method,
 		'relationship_guid' => $user->guid,
-		'types' => 'group',
+		'type' => 'group',
 		'limit' => 99999,
 	));
 	$tmparray = array();
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index 11f266303..57fa62405 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -31,7 +31,7 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) {
 	$subsbig[$method] = elgg_get_entities_from_relationship(array(
 		'relationship' => 'notify' . $method,
 		'relationship_guid' => $user->guid,
-		'types' => 'user',
+		'type' => 'user',
 		'limit' => 99999,
 	));
 }
diff --git a/mod/pages/pages/pages/owner.php b/mod/pages/pages/pages/owner.php
index b29332ee1..a061225e2 100644
--- a/mod/pages/pages/pages/owner.php
+++ b/mod/pages/pages/pages/owner.php
@@ -20,7 +20,7 @@ elgg_push_breadcrumb($owner->name);
 elgg_register_title_button();
 
 $content = elgg_list_entities(array(
-	'types' => 'object',
+	'type' => 'object',
 	'subtypes' => 'page_top',
 	'container_guid' => elgg_get_page_owner_guid(),
 	'full_view' => false,
diff --git a/mod/pages/pages/pages/world.php b/mod/pages/pages/pages/world.php
index e6a705b6b..e5a29eb63 100644
--- a/mod/pages/pages/pages/world.php
+++ b/mod/pages/pages/pages/world.php
@@ -13,7 +13,7 @@ elgg_push_breadcrumb(elgg_echo('pages'));
 elgg_register_title_button();
 
 $content = elgg_list_entities(array(
-	'types' => 'object',
+	'type' => 'object',
 	'subtypes' => 'page_top',
 	'full_view' => false,
 ));
diff --git a/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php b/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php
index 32f108312..c37761f32 100644
--- a/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php
+++ b/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php
@@ -5,7 +5,7 @@
  * @package ElggReportedContent
  */
 
-$list = elgg_list_entities(array('types' => 'object', 'subtypes' => 'reported_content'));
+$list = elgg_list_entities(array('type' => 'object', 'subtypes' => 'reported_content'));
 if (!$list) {
 	$list = '<p class="mtm">' . elgg_echo('reportedcontent:none') . '</p>';
 }
diff --git a/mod/reportedcontent/views/default/widgets/reportedcontent/content.php b/mod/reportedcontent/views/default/widgets/reportedcontent/content.php
index 4c6595653..d6af8e87b 100644
--- a/mod/reportedcontent/views/default/widgets/reportedcontent/content.php
+++ b/mod/reportedcontent/views/default/widgets/reportedcontent/content.php
@@ -4,7 +4,7 @@
  */
 
 $list = elgg_list_entities(array(
-	'types' => 'object',
+	'type' => 'object',
 	'subtypes' => 'reported_content',
 	'limit' => $vars['entity']->num_display,
 	'pagination' => false,
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index b5d9dbd80..ef0d550d2 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -9,7 +9,7 @@ $owner = $vars['entity']->guid;
 
 //grab the user's latest from the wire
 $params = array(
-	'types' => 'object',
+	'type' => 'object',
 	'subtypes' => 'thewire',
 	'owner_guid' => $owner,
 	'limit' => 1,