Defect #6254 » 6254.patch
| app/controllers/account_controller.rb | ||
|---|---|---|
| 103 | 103 |
user = User.find_by_mail(email) |
| 104 | 104 |
# user not found |
| 105 | 105 |
unless user |
| 106 |
flash.now[:error] = l(:notice_account_unknown_email) |
|
| 106 |
# an error that indicates the email is invalid should not be |
|
| 107 |
# displayed to prevent email harvesting |
|
| 108 |
flash[:notice] = l(:notice_account_lost_email_sent) |
|
| 107 | 109 |
return |
| 108 | 110 |
end |
| 109 | 111 |
unless user.active? |
| config/locales/en.yml | ||
|---|---|---|
| 156 | 156 |
notice_account_password_updated: Password was successfully updated. |
| 157 | 157 |
notice_account_wrong_password: Wrong password |
| 158 | 158 |
notice_account_register_done: Account was successfully created. An email containing the instructions to activate your account was sent to %{email}.
|
| 159 |
notice_account_unknown_email: Unknown user. |
|
| 160 | 159 |
notice_account_not_activated_yet: You haven't activated your account yet. If you want to receive a new activation email, please <a href="%{url}">click this link</a>.
|
| 161 | 160 |
notice_account_locked: Your account is locked. |
| 162 | 161 |
notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password. |