correct singual usage of subtype in elgg_get_entities_* functions

diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index e967df3dd36f85f1066962450d1e1f99e12473a6..622b58212e5edb48d7e055cda83b7dd112166335 100644 (file)
--- 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 805dacd2da89ff0e63b364214e92487a4a6a9e03..236fbc28e914e6748aeabdd7a472987e435b5613 100644 (file)
--- 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 7dc6b7c2d22e7581ba39ff6cf17bd50e5d99d3a4..6b0b1429ba5766532dc0fa9c2a85732b5376acf6 100644 (file)
--- 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 d255c2e67cee007d0b0fdfc2828eac60bdcd8a55..6f7a6145e6021a40bf1ee5ee168553110776a233 100644 (file)
--- 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 8924506e935176f19cf18195659cbd203b6edb7a..4e677d5c426d952b47f40e0dd9e6b62f4789a9dd 100644 (file)
--- 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 1409a404e5c98b975c2db6719ae03eb3e248630d..d7f057f2ab74bfaebc6da6d7718fbdc790bf627d 100644 (file)
--- 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 35f8a7db7f9ff01dfe9bc70b65dd7ff06c5e18b6..d60dfb7555c238219984d5a47c6bbe291d765e3c 100644 (file)
--- 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 8cf8ad1388f169c069f33174f0a74f745de34156..8e6c87f2667cfb6434081c9c6b8d310662b3dd5e 100644 (file)
--- 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 a061225e27cdaa75cebabd913a33ab8aae34a832..48199368c81086690dbda976208319aa91339ab9 100644 (file)
--- 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 e5a29eb6311c11b29fa33962a4a997a36f55f80a..c130a6bd6dfea56328be070c7d0f067747344609 100644 (file)
--- 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 c37761f32cd62c43984b4bd79bafcdc1d71dfe6b..ed52a536d659024235232ca5111505727fc5938a 100644 (file)
--- 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 d6af8e87bce87f22a766d7bdd45d109035b103bb..0095decca8f97a64b1b4bc574ae692e90ab019cd 100644 (file)
--- 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 ef0d550d2c6d9e8faed0236f9fe2ae362805e899..26e1403fee50cd9535024bdf0f548c1172ef33f5 100644 (file)
--- 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,
 );