aboutsummaryrefslogtreecommitdiff
path: root/actions/admin/user
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-03 19:46:47 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-03 19:46:47 +0000
commit998a39940b27561d7a2e98b68c8929dab68fe62f (patch)
tree79e73eb7bd8ae843609a2f4f0a526377800430e1 /actions/admin/user
parent4b3749440c560da36b7deadcee65133062fd10a1 (diff)
downloadelgg-998a39940b27561d7a2e98b68c8929dab68fe62f.tar.gz
elgg-998a39940b27561d7a2e98b68c8929dab68fe62f.tar.bz2
Refs #1320. Updated core to use elgg_echo()'s native string replacement.
git-svn-id: http://code.elgg.org/elgg/trunk@7227 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions/admin/user')
-rw-r--r--actions/admin/user/delete.php2
-rw-r--r--actions/admin/user/resetpassword.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php
index 375f8b809..e8d835722 100644
--- a/actions/admin/user/delete.php
+++ b/actions/admin/user/delete.php
@@ -22,7 +22,7 @@ $username = $obj->username;
if (($obj instanceof ElggUser) && ($obj->canEdit())) {
if ($obj->delete()) {
- system_message(sprintf(elgg_echo('admin:user:delete:yes'), $name));
+ system_message(elgg_echo('admin:user:delete:yes', array($name)));
} else {
register_error(elgg_echo('admin:user:delete:no'));
}
diff --git a/actions/admin/user/resetpassword.php b/actions/admin/user/resetpassword.php
index 46a983c86..24127eb8b 100644
--- a/actions/admin/user/resetpassword.php
+++ b/actions/admin/user/resetpassword.php
@@ -32,7 +32,7 @@ if (($obj instanceof ElggUser) && ($obj->canEdit())) {
notify_user($obj->guid,
$CONFIG->site->guid,
elgg_echo('email:resetpassword:subject'),
- sprintf(elgg_echo('email:resetpassword:body'), $obj->username, $password),
+ elgg_echo('email:resetpassword:body', array($obj->username, $password)),
NULL,
'email');
} else {