diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-15 12:39:48 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-15 12:39:48 +0000 |
| commit | c46cadcc8264e5ded6e335a337e0312fee42da3c (patch) | |
| tree | 3d3387d99108710ca25ed2109b5db24d34f5fc82 /mod/groups/actions | |
| parent | f27e928df0f04f71e2688ef9d2bc095710991dd0 (diff) | |
| download | elgg-c46cadcc8264e5ded6e335a337e0312fee42da3c.tar.gz elgg-c46cadcc8264e5ded6e335a337e0312fee42da3c.tar.bz2 | |
Fixes #144
git-svn-id: https://code.elgg.org/elgg/trunk@1426 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups/actions')
| -rw-r--r-- | mod/groups/actions/addtogroup.php | 8 | ||||
| -rw-r--r-- | mod/groups/actions/edit.php | 2 | ||||
| -rw-r--r-- | mod/groups/actions/joinrequest.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php index 10aea2880..1910a8196 100644 --- a/mod/groups/actions/addtogroup.php +++ b/mod/groups/actions/addtogroup.php @@ -47,8 +47,8 @@ // send welcome email notify_user($user->getGUID(), $group->owner_guid, - sprintf(elgg_echo('groups:welcome:subject'), $group->title), - sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->title, $group->getURL()), + sprintf(elgg_echo('groups:welcome:subject'), $group->name), + sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->name, $group->getURL()), NULL, "email"); system_message(elgg_echo('groups:addedtogroup')); @@ -80,8 +80,8 @@ { // Send email if (notify_user($user->getGUID(), $group->owner_guid, - sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->title), - sprintf(elgg_echo('groups:invite:body'), $user->name, $group->title, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"), + sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name), + sprintf(elgg_echo('groups:invite:body'), $user->name, $group->name, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"), NULL, "email")) system_message(elgg_echo("groups:userinvited")); else diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php index 75ae1f80f..d7c1833a5 100644 --- a/mod/groups/actions/edit.php +++ b/mod/groups/actions/edit.php @@ -46,7 +46,7 @@ } // Validate create - if (!$group->title) + if (!$group->name) { register_error(elgg_echo("groups:notitle")); diff --git a/mod/groups/actions/joinrequest.php b/mod/groups/actions/joinrequest.php index 3539221fe..bbe896342 100644 --- a/mod/groups/actions/joinrequest.php +++ b/mod/groups/actions/joinrequest.php @@ -70,8 +70,8 @@ // Send email if (notify_user($group->owner_guid, $user->getGUID(), - sprintf(elgg_echo('groups:request:subject'), $user->name, $group->title), - sprintf(elgg_echo('groups:request:body'), $group->getOwner()->name, $user->name, $group->title, $user->getURL(), "{$CONFIG->url}action/groups/addtogroup?user_guid={$user->guid}&group_guid={$group->guid}"), + sprintf(elgg_echo('groups:request:subject'), $user->name, $group->name), + sprintf(elgg_echo('groups:request:body'), $group->getOwner()->name, $user->name, $group->name, $user->getURL(), "{$CONFIG->url}action/groups/addtogroup?user_guid={$user->guid}&group_guid={$group->guid}"), NULL, "email")) system_message(elgg_echo("groups:joinrequestmade")); else |