diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 22:37:30 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 22:37:30 +0000 |
| commit | ca08eb6d170d375ef4fca53604956f3474c7db19 (patch) | |
| tree | a1e96c6b0ae322fab93373a66e1951e2b3b9be48 /mod/groups | |
| parent | be37104ac63cd25f2eac831ca03d6d2b19976e1c (diff) | |
| download | elgg-ca08eb6d170d375ef4fca53604956f3474c7db19.tar.gz elgg-ca08eb6d170d375ef4fca53604956f3474c7db19.tar.bz2 | |
Merged r6701:6756 from 1.7 branch into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6849 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups')
| -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 |
3 files changed, 11 insertions, 3 deletions
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> |