Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop

# Conflicts: # config/version.php
2019-02-13 23:02:21 -08:00
parent d24851c5d8 c3c4ad1ae6
commit 0000f487ac
10 changed files with 21 additions and 25 deletions
@@ -146,8 +146,7 @@ class ProfileController extends Controller

        $rules = array(
            'current_password'     => 'required',
-            'password'         => Setting::passwordComplexityRulesSaving('store'),
-            'password_confirm' => 'required|same:password',
+            'password'         => Setting::passwordComplexityRulesSaving('store').'|confirmed',
        );

        $validator = \Validator::make($request->all(), $rules);