From 63bb2de4d4d560e6418b80f7c784c64de413a061 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 2 Nov 2020 20:13:54 -0800
Subject: [PATCH] Derp. Check and make sure that setting is actually on

---
 app/Http/Controllers/ProfileController.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index ae283cd25a..140c73ab26 100755
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -165,15 +165,20 @@ class ProfileController extends Controller
 
             // There may be a more elegant way to do this in the future.
 
-            if (($request->input('password') == $user->username) ||
-                ($request->input('password') == $user->email) ||
-                ($request->input('password') == $user->first_name) ||
-                ($request->input('password') == $user->last_name))
-            {
-                $validator->errors()->add('password', trans('validation.disallow_same_pwd_as_user_fields'));
+            // First let's see if that option is enabled in the settings
+            if (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields')) {
+                \Log::debug('disallow_same_pwd_as_user_fields is ON');
+                if (($request->input('password') == $user->username) ||
+                    ($request->input('password') == $user->email) ||
+                    ($request->input('password') == $user->first_name) ||
+                    ($request->input('password') == $user->last_name))
+                {
+                    $validator->errors()->add('password', trans('validation.disallow_same_pwd_as_user_fields'));
+                }
             }
 
 
+
             
         });