summaryrefslogtreecommitdiff
path: root/modules/user/controllers/password.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-07-02 18:00:22 -0700
committerBharat Mediratta <bharat@menalto.com>2009-07-02 18:00:22 -0700
commiteb5538d1357dade9e6e08d1b603033928944011c (patch)
treeee04f9be38a40f4125eafab5367bba6cf1b61164 /modules/user/controllers/password.php
parent1a5fe42b555d51d22bde1521100a31d2b434486b (diff)
parenta633c134b754305eaa611c5d67af4ca7c79beafe (diff)
Merge branch 'master' of git@github.com:/gallery/gallery3
Conflicts: modules/server_add/controllers/admin_server_add.php
Diffstat (limited to 'modules/user/controllers/password.php')
-rw-r--r--modules/user/controllers/password.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 2dde11b8..ed3b9736 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -72,7 +72,9 @@ class Password_Controller extends Controller {
->message($message->render())
->send();
- log::success("user", "Password reset email sent for user $user->name");
+ log::success(
+ "user",
+ t("Password reset email sent for user %name", array("name" => p::clean($user->name)));
} else {
// Don't include the username here until you're sure that it's XSS safe
log::warning(