mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Merge multi-db password reset fix
This commit is contained in:
parent
265c4ae35d
commit
859265a946
@ -59,14 +59,8 @@ class ResetPasswordController extends Controller
|
|||||||
|
|
||||||
public function showResetForm(Request $request, $token = null)
|
public function showResetForm(Request $request, $token = null)
|
||||||
{
|
{
|
||||||
$passwordReset = PasswordReset::whereToken($token)->first();
|
|
||||||
|
|
||||||
if (! $passwordReset) {
|
|
||||||
return redirect('login')->withMessage(trans('texts.invalid_code'));
|
|
||||||
}
|
|
||||||
|
|
||||||
return view('auth.passwords.reset')->with(
|
return view('auth.passwords.reset')->with(
|
||||||
['token' => $token, 'email' => $passwordReset->email]
|
['token' => $token]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
<input type="hidden" name="token" value="{{{ $token }}}">
|
<input type="hidden" name="token" value="{{{ $token }}}">
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
{!! Former::text('email')->placeholder(trans('texts.email'))->value($email)->readonly(true)->raw() !!}
|
{!! Former::text('email')->placeholder(trans('texts.email'))->raw() !!}
|
||||||
{!! Former::password('password')->placeholder(trans('texts.password'))->autocomplete('new-password')->raw() !!}
|
{!! Former::password('password')->placeholder(trans('texts.password'))->autocomplete('new-password')->raw() !!}
|
||||||
{!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->autocomplete('new-password')->raw() !!}
|
{!! Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->autocomplete('new-password')->raw() !!}
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user