summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-04-17 12:28:46 -0700
committerBharat Mediratta <bharat@menalto.com>2010-04-17 12:28:46 -0700
commit6d81feacae8329cd0c65abe920ecd3fa2e8f2537 (patch)
tree0fce8325db3b6a92baecbc6b5615199d7ac22e51 /modules/user
parent27b29afd7cf679f33429ce144871c1d96f137fbb (diff)
Change the key for invalid passwords from "invalid" to
"invalid_password" to remove ambiguity.
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/controllers/users.php2
-rw-r--r--modules/user/helpers/user.php2
2 files changed, 2 insertions, 2 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"));
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 1ad4bbd2..55153263 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -72,7 +72,7 @@ class user_Core {
static function valid_password($password_input) {
if (!user::is_correct_password(identity::active_user(), $password_input->value)) {
- $password_input->add_error("invalid", 1);
+ $password_input->add_error("invalid_password", 1);
}
}