diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-03 22:13:10 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-03 22:13:10 +0000 |
| commit | eff4faea7f3c95440f02ea45d0be4f67236e2bf3 (patch) | |
| tree | 57d51ef4bc84547d60c9a6faae7d5ff5d82d00f9 /mod/groups/actions | |
| parent | 4b501dda1d62195531e4c2ab1bd84971c0cd4e37 (diff) | |
| download | elgg-eff4faea7f3c95440f02ea45d0be4f67236e2bf3.tar.gz elgg-eff4faea7f3c95440f02ea45d0be4f67236e2bf3.tar.bz2 | |
Fixes #1320: Bundled mods use elgg_echo()'s internal string substitution.
git-svn-id: http://code.elgg.org/elgg/trunk@7229 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/invite.php | 4 | ||||
| -rw-r--r-- | mod/groups/actions/joinrequest.php | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php index dab44666d..346b6065e 100644 --- a/mod/groups/actions/addtogroup.php +++ b/mod/groups/actions/addtogroup.php @@ -51,8 +51,8 @@ // 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, $group->name, $group->getURL()), + elgg_echo('groups:welcome:subject', array($group->name)), + elgg_echo('groups:welcome:body', array($user->name, $group->name, $group->getURL())), NULL); system_message(elgg_echo('groups:addedtogroup')); @@ -71,8 +71,8 @@ // Send email $url = elgg_get_site_url()."pg/groups/invited?user_guid={$user->guid}&group_guid={$group->guid}"; if (notify_user($user->getGUID(), $group->owner_guid, - sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name), - sprintf(elgg_echo('groups:invite:body'), $user->name, $logged_in_user->name, $group->name, $url), + elgg_echo('groups:invite:subject', array($user->name, $group->name)), + elgg_echo('groups:invite:body', array($user->name, $logged_in_user->name, $group->name, $url)), NULL)) system_message(elgg_echo("groups:userinvited")); else diff --git a/mod/groups/actions/invite.php b/mod/groups/actions/invite.php index 9ab4f2440..6fe379fe1 100644 --- a/mod/groups/actions/invite.php +++ b/mod/groups/actions/invite.php @@ -40,8 +40,8 @@ if (sizeof($user_guid)) // Send email $url = "{$CONFIG->url}pg/groups/invitations/{$user->username}"; if (notify_user($user->getGUID(), $group->owner_guid, - sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name), - sprintf(elgg_echo('groups:invite:body'), $user->name, $logged_in_user->name, $group->name, $url), + elgg_echo('groups:invite:subject', array($user->name, $group->name)), + elgg_echo('groups:invite:body', array($user->name, $logged_in_user->name, $group->name, $url)), NULL)) system_message(elgg_echo("groups:userinvited")); else diff --git a/mod/groups/actions/joinrequest.php b/mod/groups/actions/joinrequest.php index a3b372e65..f9bdf2f21 100644 --- a/mod/groups/actions/joinrequest.php +++ b/mod/groups/actions/joinrequest.php @@ -67,8 +67,8 @@ if (($group) && ($user) && (!$group->isMember($user))) // Send email $url = "{$CONFIG->url}mod/groups/membershipreq.php?group_guid={$group->guid}"; if (notify_user($group->owner_guid, $user->getGUID(), - sprintf(elgg_echo('groups:request:subject'), $user->name, $group->name), - sprintf(elgg_echo('groups:request:body'), $group->getOwnerEntity()->name, $user->name, $group->name, $user->getURL(), $url), + elgg_echo('groups:request:subject', array($user->name, $group->name)), + elgg_echo('groups:request:body', array($group->getOwnerEntity()->name, $user->name, $group->name, $user->getURL(), $url)), NULL)) system_message(elgg_echo("groups:joinrequestmade")); else |