diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index 96082ee..f447b35 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -974,7 +974,7 @@ sub emailRecoverPasswordFinish { my $recoveryGuid = $session->id->generate(); my $url = $session->url->getSiteURL; my $userId = $user->userId; #get the user guid - $email = $user->profileField('email') unless $email; #get email address from the profile, unless we already have it + $email = $user->profileField('email'); my $authsettings = $self->getParams($userId); $authsettings->{emailRecoverPasswordVerificationNumber} = $recoveryGuid; @@ -984,7 +984,7 @@ sub emailRecoverPasswordFinish { my $mail = WebGUI::Mail::Send->create($session, { to=>$email, subject=>'WebGUI password recovery'}); $mail->addText($i18n->get('recover password email text1', 'AuthWebGUI') . $url. ". \n\n".$i18n->get('recover password email text2', 'AuthWebGUI')." \n\n ".$url."?op=auth;method=emailResetPassword;token=$recoveryGuid"."\n\n ". $i18n->get('recover password email text3', 'AuthWebGUI')); $mail->send; - return "

". $i18n->get('recover password banner', 'AuthWebGUI')."



". $i18n->get('email recover password finish message1', 'AuthWebGUI'). $email . $i18n->get('email recover password finish message2', 'AuthWebGUI') . "

"; + return "

". $i18n->get('recover password banner', 'AuthWebGUI')."



". $i18n->get('email recover password finish message', 'AuthWebGUI') . "

"; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/i18n/English/AuthWebGUI.pm b/lib/WebGUI/i18n/English/AuthWebGUI.pm index 539e91d..4debd98 100644 --- a/lib/WebGUI/i18n/English/AuthWebGUI.pm +++ b/lib/WebGUI/i18n/English/AuthWebGUI.pm @@ -597,14 +597,9 @@ our $I18N = { lastUpdated => 177127324, }, - 'email recover password finish message1' => { - message => q|An email has been sent to |, - lastUpdated => 177127324, - }, - - 'email recover password finish message2' => { - message => q| with instructions for resetting your password.|, - lastUpdated => 177127324, + 'email recover password finish message' => { + message => q|An email has been sent with instructions for resetting your password.|, + lastUpdated => 1223581595, }, 'email recover password start message' => {