mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-27 22:49:41 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
9f8f028484
|
@ -164,7 +164,7 @@ class ProfileController extends Controller
|
||||||
$validator = \Validator::make($request->all(), $rules);
|
$validator = \Validator::make($request->all(), $rules);
|
||||||
$validator->after(function ($validator) use ($request, $user) {
|
$validator->after(function ($validator) use ($request, $user) {
|
||||||
if (! Hash::check($request->input('current_password'), $user->password)) {
|
if (! Hash::check($request->input('current_password'), $user->password)) {
|
||||||
$validator->errors()->add('current_password', trans('validation.hashed_pass'));
|
$validator->errors()->add('current_password', trans('validation.custom.hashed_pass'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// This checks to make sure that the user's password isn't the same as their username,
|
// This checks to make sure that the user's password isn't the same as their username,
|
||||||
|
|
Loading…
Reference in a new issue