aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorJerome Bakker <jeabakker@coldtrick.com>2012-10-03 14:11:41 +0200
committerJerome Bakker <jeabakker@coldtrick.com>2012-10-03 14:11:41 +0200
commite33d1eba6a158699174de2747de6d6e654c03407 (patch)
treee2b7129e3140238b13922552247eaa57f3639e89 /engine
parent949a3f0c2ea1804577ff69d92f811ced71a79976 (diff)
downloadelgg-e33d1eba6a158699174de2747de6d6e654c03407.tar.gz
elgg-e33d1eba6a158699174de2747de6d6e654c03407.tar.bz2
correct singual usage of subtype in elgg_get_entities_* functions
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/deprecated-1.8.php10
-rw-r--r--engine/lib/sites.php2
-rw-r--r--engine/lib/users.php4
-rw-r--r--engine/tests/api/entity_getter_functions.php2
4 files changed, 9 insertions, 9 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);