diff options
Diffstat (limited to 'actions/user/requestnewpassword.php')
| -rw-r--r-- | actions/user/requestnewpassword.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/actions/user/requestnewpassword.php b/actions/user/requestnewpassword.php index 2dff5f34d..a54e71b7e 100644 --- a/actions/user/requestnewpassword.php +++ b/actions/user/requestnewpassword.php @@ -14,26 +14,26 @@ action_gatekeeper(); $username = get_input('username'); -
- $access_status = access_get_show_hidden_status();
+ + $access_status = access_get_show_hidden_status(); access_show_hidden_entities(true); $user = get_user_by_username($username); if ($user) - {
+ { if ($user->validated) { if (send_new_password_request($user->guid)) system_message(elgg_echo('user:password:resetreq:success')); else - register_error(elgg_echo('user:password:resetreq:fail'));
- } else if (!trigger_plugin_hook('unvalidated_requestnewpassword','user',array('entity'=>$user))) {
- // if plugins have not registered an action, the default action is to
- // trigger the validation event again and assume that the validation
- // event will display an appropriate message
- trigger_elgg_event('validate', 'user', $user);
+ register_error(elgg_echo('user:password:resetreq:fail')); + } else if (!trigger_plugin_hook('unvalidated_requestnewpassword','user',array('entity'=>$user))) { + // if plugins have not registered an action, the default action is to + // trigger the validation event again and assume that the validation + // event will display an appropriate message + trigger_elgg_event('validate', 'user', $user); } } else - register_error(sprintf(elgg_echo('user:username:notfound'), $username));
+ register_error(sprintf(elgg_echo('user:username:notfound'), $username)); access_show_hidden_entities($access_status); forward(); |