correct singual usage of type in elgg_get_entities_* functions

diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index 4b9d41543fa63a730b432a53b41eaaea3228a5a4..e967df3dd36f85f1066962450d1e1f99e12473a6 100644 (file)
--- 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 feb1f1e7fb3af396dfbb81a021d3203f2b8c3031..da5fb86565ff116b081877d682728220d06708b6 100644 (file)
--- 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 18faff27ff2b74c43f77cfdba15f9573b1fcf75b..7382955884af19191e983a7142c4ec20df84b211 100644 (file)
--- 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 f186c66cb1105073d2215af240264d0bbac15b13..1dd5c5ec7448d8964188c04b2a821452140f6b16 100644 (file)
--- 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 850092cada234023ce5efdafbb2b77c1d6d7371b..805dacd2da89ff0e63b364214e92487a4a6a9e03 100644 (file)
--- 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 527eff3cdbb43c4402ca51861a545849f8441665..7dc6b7c2d22e7581ba39ff6cf17bd50e5d99d3a4 100644 (file)
--- 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 9db248de96ebdd46f6404cb3f55e6882c5025e39..d255c2e67cee007d0b0fdfc2828eac60bdcd8a55 100644 (file)
--- 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 53990a0062045e343b86618fd2a2a661f4c96b7c..05771f576a57252afcf8579a182e2c6d41dbf999 100644 (file)
--- 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 fb87af1b275c9e9af753bf1be063d47b5edc3db7..1409a404e5c98b975c2db6719ae03eb3e248630d 100644 (file)
--- 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 402a289331e99b3eabe2514e44ad1ef56dd1a814..35f8a7db7f9ff01dfe9bc70b65dd7ff06c5e18b6 100644 (file)
--- 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 770dfd6e84e3bf1a07b5631ead71be247202d0cb..8cf8ad1388f169c069f33174f0a74f745de34156 100644 (file)
--- 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 505cacd016e06ab3a4dac4f45c311dcf65da674e..a9eb6e843e84231816b878c15fe0f07cf6d4818a 100644 (file)
--- 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 c591410c566dc5beaa4dc99bd5fcccd25e0dee5b..9689802eb30cb30dc771c48684c9bc5255bf7d0d 100644 (file)
--- 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 8bd51ab5c49e6d7fa25d985c360ee2cd1b09187b..f3f8f8d2d5a826ce986e759f67650ef3fbb8069a 100644 (file)
--- 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 11273d0e676fbfef88d26c7e848437150ff9edb2..1199a0c3436666e5621bcbedb2804f5fc5f96f32 100644 (file)
--- 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 7838f7e63bfa461d9dde5840dc224ee50718f863..c646c188571fe1f529f71996e8bc07b7a29ca71f 100644 (file)
--- 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 3347d4054bd83322b53dca3e07743db1fa377dad..d29c43e1f99bdd735959be3629e02094e2cfa6b2 100644 (file)
--- 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 cd1857f040f09156d0f510c068d2aa72a0d2d2ff..ff03cb274751943955ecd962e4c3907358a4a684 100644 (file)
--- 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 168639ab2e5c0c1e64d85c370ca06491451ca497..64db8f5339fab08d77fe099ac28f7e2779519a30 100644 (file)
--- 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 11f26630359fd67e31281012ec0572a1fedb3d2c..57fa62405a5b3c3b2bcf63fd230fc50adb7a77c9 100644 (file)
--- 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 b29332ee1600f33c82c3cb9426890800b147d7fa..a061225e27cdaa75cebabd913a33ab8aae34a832 100644 (file)
--- 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 e6a705b6bbca1d2b49ed6be3b78d368ffdb602a5..e5a29eb6311c11b29fa33962a4a997a36f55f80a 100644 (file)
--- 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 32f1083128382dbe0f96fac79131bd6939f8d7f5..c37761f32cd62c43984b4bd79bafcdc1d71dfe6b 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('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 4c65956537e40dce4a6b895b775836e5e8f08fe6..d6af8e87bce87f22a766d7bdd45d109035b103bb 100644 (file)
--- 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 b5d9dbd804a595dadc3a4c47deb8591883fe643a..ef0d550d2c6d9e8faed0236f9fe2ae362805e899 100644 (file)
--- 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,