correct singual usage of subtype in elgg_get_entities_* functions

13 files changed, 18 insertions, 18 deletions

diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index e967df3dd..622b58212 100644
--- a/engine/lib/deprecated-1.8.php
+++ b/engine/lib/deprecated-1.8.php
@@ -87,7 +87,7 @@ function list_entities_from_access_id($access_id, $entity_type = "", $entity_sub
 	elgg_deprecated_notice("All list_entities* functions were deprecated in 1.8.  Use elgg_list_entities* instead.", 1.8);
 
 	echo elgg_list_entities_from_access_id(array('access_id' => $access_id,
-		'types' => $entity_type, 'subtypes' => $entity_subtype, 'owner_guids' => $owner_guid,
+		'types' => $entity_type, 'subtype' => $entity_subtype, 'owner_guids' => $owner_guid,
 		'limit' => $limit, 'full_view' => $fullview, 'list_type_toggle' => $listtypetoggle,
 		'pagination' => $pagination,));
 }
@@ -1315,7 +1315,7 @@ function list_entities_from_metadata($meta_name, $meta_value = "", $entity_type
 		'metadata_name' => $meta_name,
 		'metadata_value' => $meta_value,
 		'types' => $entity_type,
-		'subtypes' => $entity_subtype,
+		'subtype' => $entity_subtype,
 		'limit' => $limit,
 		'offset' => $offset,
 		'count' => TRUE,
@@ -2121,7 +2121,7 @@ $fullview = true, $listtypetoggle = false, $pagination = true, $order_by = '') {
 		'relationship_guid' => $relationship_guid,
 		'inverse_relationship' => $inverse_relationship,
 		'types' => $type,
-		'subtypes' => $subtype,
+		'subtype' => $subtype,
 		'owner_guid' => $owner_guid,
 		'order_by' => $order_by,
 		'limit' => $limit,
@@ -2567,7 +2567,7 @@ $owner_guid = "", $owner_relationship = "") {
 				'relationship_guid' => $owner_guid[0],
 				'inverse_relationship' => FALSE,
 				'type' => 'user',
-				'subtypes' => $subtype,
+				'subtype' => $subtype,
 				'limit' => 9999))
 			) {
 
@@ -2722,7 +2722,7 @@ function get_site_collections($site_guid, $subtype = "", $limit = 10, $offset =
 		'relationship_guid' => $site_guid,
 		'inverse_relationship' => TRUE,
 		'type' => 'collection',
-		'subtypes' => $subtype,
+		'subtype' => $subtype,
 		'limit' => $limit,
 		'offset' => $offset
 	));
diff --git a/engine/lib/sites.php b/engine/lib/sites.php
index 805dacd2d..236fbc28e 100644
--- a/engine/lib/sites.php
+++ b/engine/lib/sites.php
@@ -184,7 +184,7 @@ function get_site_objects($site_guid, $subtype = "", $limit = 10, $offset = 0) {
 		'relationship_guid' => $site_guid,
 		'inverse_relationship' => TRUE,
 		'type' => 'object',
-		'subtypes' => $subtype,
+		'subtype' => $subtype,
 		'limit' => $limit,
 		'offset' => $offset
 	));
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 7dc6b7c2d..6b0b1429b 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -387,7 +387,7 @@ $offset = 0) {
 		'relationship' => 'friend',
 		'relationship_guid' => $user_guid,
 		'type' => 'user',
-		'subtypes' => $subtype,
+		'subtype' => $subtype,
 		'limit' => $limit,
 		'offset' => $offset
 	));
@@ -411,7 +411,7 @@ $offset = 0) {
 		'relationship_guid' => $user_guid,
 		'inverse_relationship' => TRUE,
 		'type' => 'user',
-		'subtypes' => $subtype,
+		'subtype' => $subtype,
 		'limit' => $limit,
 		'offset' => $offset
 	));
diff --git a/engine/tests/api/entity_getter_functions.php b/engine/tests/api/entity_getter_functions.php
index d255c2e67..6f7a6145e 100644
--- a/engine/tests/api/entity_getter_functions.php
+++ b/engine/tests/api/entity_getter_functions.php
@@ -426,7 +426,7 @@ class ElggCoreEntityGetterFunctionsTest extends ElggCoreUnitTest {
 
 		$options = array(
 			'types' => $types,
-			'subtypes' => $subtype
+			'subtype' => $subtype
 		);
 
 		$es = elgg_get_entities($options);
diff --git a/mod/categories/pages/categories/listing.php b/mod/categories/pages/categories/listing.php
index 8924506e9..4e677d5c4 100644
--- a/mod/categories/pages/categories/listing.php
+++ b/mod/categories/pages/categories/listing.php
@@ -16,7 +16,7 @@ $params = array(
 	'metadata_name' => 'universal_categories',
 	'metadata_value' => $category,
 	'types' => $type,
-	'subtypes' => $subtype,
+	'subtype' => $subtype,
 	'owner_guid' => $owner_guid,
 	'limit' => $limit,
 	'full_view' => FALSE,
diff --git a/mod/file/pages/file/owner.php b/mod/file/pages/file/owner.php
index 1409a404e..d7f057f2a 100644
--- a/mod/file/pages/file/owner.php
+++ b/mod/file/pages/file/owner.php
@@ -37,7 +37,7 @@ $title = elgg_echo("file:user", array($owner->name));
 // List files
 $content = elgg_list_entities(array(
 	'type' => 'object',
-	'subtypes' => 'file',
+	'subtype' => 'file',
 	'container_guid' => $owner->guid,
 	'limit' => 10,
 	'full_view' => FALSE,
diff --git a/mod/file/pages/file/search.php b/mod/file/pages/file/search.php
index 35f8a7db7..d60dfb755 100644
--- a/mod/file/pages/file/search.php
+++ b/mod/file/pages/file/search.php
@@ -75,7 +75,7 @@ if ($listtype == "gallery") {
 
 $params = array(
 	'type' => 'object',
-	'subtypes' => 'file',
+	'subtype' => 'file',
 	'container_guid' => $page_owner_guid,
 	'limit' => $limit,
 	'full_view' => false,
diff --git a/mod/file/pages/file/world.php b/mod/file/pages/file/world.php
index 8cf8ad138..8e6c87f26 100644
--- a/mod/file/pages/file/world.php
+++ b/mod/file/pages/file/world.php
@@ -15,7 +15,7 @@ $title = elgg_echo('file:all');
 
 $content = elgg_list_entities(array(
 	'type' => 'object',
-	'subtypes' => 'file',
+	'subtype' => 'file',
 	'limit' => $limit,
 	'full_view' => FALSE
 ));
diff --git a/mod/pages/pages/pages/owner.php b/mod/pages/pages/pages/owner.php
index a061225e2..48199368c 100644
--- a/mod/pages/pages/pages/owner.php
+++ b/mod/pages/pages/pages/owner.php
@@ -21,7 +21,7 @@ elgg_register_title_button();
 
 $content = elgg_list_entities(array(
 	'type' => 'object',
-	'subtypes' => 'page_top',
+	'subtype' => '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 e5a29eb63..c130a6bd6 100644
--- a/mod/pages/pages/pages/world.php
+++ b/mod/pages/pages/pages/world.php
@@ -14,7 +14,7 @@ elgg_register_title_button();
 
 $content = elgg_list_entities(array(
 	'type' => 'object',
-	'subtypes' => 'page_top',
+	'subtype' => 'page_top',
 	'full_view' => false,
 ));
 if (!$content) {
diff --git a/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php b/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php
index c37761f32..ed52a536d 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('type' => 'object', 'subtypes' => 'reported_content'));
+$list = elgg_list_entities(array('type' => 'object', 'subtype' => '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 d6af8e87b..0095decca 100644
--- a/mod/reportedcontent/views/default/widgets/reportedcontent/content.php
+++ b/mod/reportedcontent/views/default/widgets/reportedcontent/content.php
@@ -5,7 +5,7 @@
 
 $list = elgg_list_entities(array(
 	'type' => 'object',
-	'subtypes' => 'reported_content',
+	'subtype' => '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 ef0d550d2..26e1403fe 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -10,7 +10,7 @@ $owner = $vars['entity']->guid;
 //grab the user's latest from the wire
 $params = array(
 	'type' => 'object',
-	'subtypes' => 'thewire',
+	'subtype' => 'thewire',
 	'owner_guid' => $owner,
 	'limit' => 1,
 );