diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
| commit | eb5538d1357dade9e6e08d1b603033928944011c (patch) | |
| tree | ee04f9be38a40f4125eafab5367bba6cf1b61164 /modules/user/controllers/login.php | |
| parent | 1a5fe42b555d51d22bde1521100a31d2b434486b (diff) | |
| parent | a633c134b754305eaa611c5d67af4ca7c79beafe (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/login.php')
| -rw-r--r-- | modules/user/controllers/login.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php index 54a7905e..4d901051 100644 --- a/modules/user/controllers/login.php +++ b/modules/user/controllers/login.php @@ -62,7 +62,8 @@ class Login_Controller extends Controller { if (!$user->loaded || !user::is_correct_password($user, $form->login->password->value)) { log::warning( "user", - t("Failed login for %name", array("name" => $form->login->inputs["name"]->value))); + t("Failed login for %name", + array("name" => p::clean($form->login->inputs["name"]->value)))); $form->login->inputs["name"]->add_error("invalid_login", 1); $valid = false; } @@ -70,7 +71,7 @@ class Login_Controller extends Controller { if ($valid) { user::login($user); - log::info("user", t("User %name logged in", array("name" => $user->name))); + log::info("user", t("User %name logged in", array("name" => p::clean($user->name)))); } // Either way, regenerate the session id to avoid session trapping |