diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-04-21 06:48:08 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-04-21 06:48:08 -0700 |
| commit | 0565d9f0f92ef9bd69c38e997e7c6e6d05d56ee1 (patch) | |
| tree | 22e5cdf12adbb77bc05e6cfa968ded72d26f5995 /modules/user/controllers | |
| parent | 027312596c29c1986d3480c7dda48533e6dd3ca8 (diff) | |
| parent | 2257776f9b4c231033656db1eb23246035aa42fd (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/user/controllers')
| -rw-r--r-- | modules/user/controllers/users.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index e1f1fa2b..7f3f6b1f 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -167,7 +167,7 @@ class Users_Controller extends Controller { $group->password("old_password")->label(t("Old password"))->id("g-password") ->callback("auth::validate_too_many_failed_auth_attempts") ->callback("user::valid_password") - ->error_messages("invalid", t("Incorrect password")) + ->error_messages("invalid_password", t("Incorrect password")) ->error_messages( "too_many_failed_auth_attempts", t("Too many incorrect passwords. Try again later")); |