From eff4faea7f3c95440f02ea45d0be4f67236e2bf3 Mon Sep 17 00:00:00 2001 From: brettp Date: Wed, 3 Nov 2010 22:13:10 +0000 Subject: 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 --- mod/uservalidationbyemail/lib/functions.php | 4 ++-- .../views/default/uservalidationbyemail/unvalidated_user.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'mod/uservalidationbyemail') diff --git a/mod/uservalidationbyemail/lib/functions.php b/mod/uservalidationbyemail/lib/functions.php index 92b37c843..b7ca30bcc 100644 --- a/mod/uservalidationbyemail/lib/functions.php +++ b/mod/uservalidationbyemail/lib/functions.php @@ -40,8 +40,8 @@ function uservalidationbyemail_request_validation($user_guid) { $site = $CONFIG->site; // Send validation email - $subject = sprintf(elgg_echo('email:validate:subject'), $user->name, $site->name); - $body = sprintf(elgg_echo('email:validate:body'), $user->name, $site->name, $link, $site->name, $site->url); + $subject = elgg_echo('email:validate:subject', array($user->name, $site->name)); + $body = elgg_echo('email:validate:body', array($user->name, $site->name, $link, $site->name, $site->url)); $result = notify_user($user->guid, $CONFIG->site->guid, $subject, $body, NULL, 'email'); if ($result) { diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php index 9e9efa29a..5844fb5f4 100644 --- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php +++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php @@ -16,22 +16,22 @@ $user = elgg_get_array_value('user', $vars); $checkbox = ""; -$created = sprintf(elgg_echo('uservalidationbyemail:admin:user_created'), elgg_view_friendly_time($user->time_created)); +$created = elgg_echo('uservalidationbyemail:admin:user_created', array(elgg_view_friendly_time($user->time_created))); $validate = elgg_view('output/confirmlink', array( - 'confirm' => sprintf(elgg_echo('uservalidationbyemail:confirm_validate_user'), $user->username), + 'confirm' => elgg_echo('uservalidationbyemail:confirm_validate_user', array($user->username)), 'href' => "action/uservalidationbyemail/validate/?user_guids[]=$user->guid", 'text' => elgg_echo('uservalidationbyemail:admin:validate') )); $resend_email = elgg_view('output/confirmlink', array( - 'confirm' => sprintf(elgg_echo('uservalidationbyemail:confirm_resend_validation'), $user->username), + 'confirm' => elgg_echo('uservalidationbyemail:confirm_resend_validation', array($user->username)), 'href' => "action/uservalidationbyemail/resend_validation/?user_guids[]=$user->guid", 'text' => elgg_echo('uservalidationbyemail:admin:resend_validation') )); $delete = elgg_view('output/confirmlink', array( - 'confirm' => sprintf(elgg_echo('uservalidationbyemail:confirm_delete'), $user->username), + 'confirm' => elgg_echo('uservalidationbyemail:confirm_delete', array($user->username)), 'href' => "action/uservalidationbyemail/delete/?user_guids[]=$user->guid", 'text' => elgg_echo('uservalidationbyemail:admin:delete') )); -- cgit v1.2.3