diff options
Diffstat (limited to 'engine/lib/users.php')
| -rw-r--r-- | engine/lib/users.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php index 55ebddd3a..843b897e9 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -742,7 +742,9 @@ function execute_new_password_request($user_guid, $conf_code) { if (force_user_password_reset($user_guid, $password)) { remove_private_setting($user_guid, 'passwd_conf_code'); - + // clean the logins failures + reset_login_failure_count($user_guid); + $email = elgg_echo('email:resetpassword:body', array($user->name, $password)); return notify_user($user->guid, $CONFIG->site->guid, @@ -1139,10 +1141,13 @@ function elgg_user_account_page_handler($page_elements, $handler) { * dropdown login link. * * @return void - * @todo finish * @access private */ function elgg_user_login_page_handler() { + if (elgg_is_logged_in()) { + forward(); + } + $login_box = elgg_view('core/account/login_box'); $content = elgg_view_layout('one_column', array('content' => $login_box)); echo elgg_view_page(elgg_echo('login'), $content); @@ -1361,11 +1366,10 @@ function elgg_profile_fields_setup() { 'twitter' => 'text' ); - $loaded_default = array(); + $loaded_defaults = array(); if ($fieldlist = elgg_get_config('profile_custom_fields')) { if (!empty($fieldlist)) { $fieldlistarray = explode(',', $fieldlist); - $loaded_defaults = array(); foreach ($fieldlistarray as $listitem) { if ($translation = elgg_get_config("admin_defined_profile_{$listitem}")) { $type = elgg_get_config("admin_defined_profile_type_{$listitem}"); |