diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/categories/listing.php | 25 | ||||
| -rw-r--r-- | mod/categories/views/default/categories/list.php | 13 | ||||
| -rw-r--r-- | mod/file/search.php | 10 | ||||
| -rw-r--r-- | mod/groups/actions/addtogroup.php | 2 | ||||
| -rw-r--r-- | mod/groups/languages/en.php | 3 | ||||
| -rw-r--r-- | mod/groups/views/default/groups/closedmembership.php | 9 |
6 files changed, 46 insertions, 16 deletions
diff --git a/mod/categories/listing.php b/mod/categories/listing.php index ecc1bede5..3a7ca6e8d 100644 --- a/mod/categories/listing.php +++ b/mod/categories/listing.php @@ -18,17 +18,20 @@ $owner_guid = get_input("owner_guid", 0); $subtype = get_input("subtype", ELGG_ENTITIES_ANY_VALUE); $type = get_input("type", 'object'); -$objects = list_entities_from_metadata('universal_categories', - $category, - $type, - $subtype, - $owner_guid, - $limit, - false, - false, - true, - false); - +$params = array( + 'metadata_name' => 'universal_categories', + 'metadata_value' => $category, + 'types' => $type, + 'subtypes' => $subtype, + 'owner_guid' => $owner_guid, + 'limit' => $limit, + 'full_view' => FALSE, + 'metadata_case_sensitive' => FALSE, +); +$current_context = get_context(); +set_context('search'); +$objects = elgg_list_entities_from_metadata($params); +set_context($current_context); $title = sprintf(elgg_echo('categories:results'), $category); diff --git a/mod/categories/views/default/categories/list.php b/mod/categories/views/default/categories/list.php index 161a21655..9b62eff51 100644 --- a/mod/categories/views/default/categories/list.php +++ b/mod/categories/views/default/categories/list.php @@ -13,7 +13,18 @@ if ($categories) { if (isset($vars['owner_guid'])) { $owner_guid = (int) $vars['owner_guid']; } - if ($cats = get_tags(0,999,'universal_categories','object',$vars['subtype'],$owner_guid)) { + + elgg_register_tag_metadata_name('universal_categories'); + $params = array( + 'threshold' => 1, + 'limit' => 999, + 'tag_names' => array('universal_categories'), + 'types' => 'object', + 'subtypes' => $vars['subtype'], + 'owner_guid' => $owner_guid, + ); + $cats = elgg_get_tags($params); + if ($cats) { foreach($cats as $cat) { $flag[] = $cat->tag; } diff --git a/mod/file/search.php b/mod/file/search.php index 9907b02e3..acc1f9cda 100644 --- a/mod/file/search.php +++ b/mod/file/search.php @@ -79,7 +79,15 @@ $limit = 10; if ($search_viewtype == "gallery") $limit = 12; if (!empty($tag)) { - $area2 .= list_entities_from_metadata($md_type, $tag, 'object', 'file', $owner_guid, $limit); + $params = array( + 'metadata_name' => $md_type, + 'metadata_value' => $tag, + 'types' => 'object', + 'subtypes' => 'file', + 'owner_guid' => $owner_guid, + 'limit' => $limit, + ); + $area2 .= elgg_list_entities_from_metadata($params); } else { $area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'owner_guid' => $owner_guid, 'limit' => $limit, 'offset' => $offset)); } diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php index 4ebb4eee0..b8f8f9b42 100644 --- a/mod/groups/actions/addtogroup.php +++ b/mod/groups/actions/addtogroup.php @@ -56,7 +56,7 @@ // send welcome email notify_user($user->getGUID(), $group->owner_guid, sprintf(elgg_echo('groups:welcome:subject'), $group->name), - sprintf(elgg_echo('groups:welcome:body'), $user->name, $logged_in_user->name, $group->name, $group->getURL()), + sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->name, $group->getURL()), NULL); system_message(elgg_echo('groups:addedtogroup')); diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php index acd1c9f8b..e986f99fe 100644 --- a/mod/groups/languages/en.php +++ b/mod/groups/languages/en.php @@ -83,7 +83,8 @@ $english = array( */ 'groups:access:private' => 'Closed - Users must be invited', 'groups:access:public' => 'Open - Any user may join', - 'groups:closedgroup' => 'This group has a closed membership. To ask to be added, click the "request membership" link.', + 'groups:closedgroup' => 'This group has a closed membership.', + 'groups:closedgroup:request' => 'To ask to be added, click the "request membership" menu link.', 'groups:visibility' => 'Who can see this group?', /* diff --git a/mod/groups/views/default/groups/closedmembership.php b/mod/groups/views/default/groups/closedmembership.php index e714602f1..b35ef0af7 100644 --- a/mod/groups/views/default/groups/closedmembership.php +++ b/mod/groups/views/default/groups/closedmembership.php @@ -10,4 +10,11 @@ */ ?> -<p class="margin_top"><?php echo elgg_echo('groups:closedgroup'); ?></p> +<p class="margin_top"> +<?php +echo elgg_echo('groups:closedgroup'); +if (isloggedin()) { + echo ' ' . elgg_echo('groups:closedgroup:request'); +} +?> +</p> |