Fix unneeded uniqueness check

TheReverend403 · Apr 8, 2016 · fac779a · fac779a
1 parent 8be8582
commit fac779a
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/app/Http/Controllers/Account/PreferencesController.php b/app/Http/Controllers/Account/PreferencesController.php
@@ -22,11 +22,18 @@ public function get()
 
     public function post(Request $request)
     {
-        $validator = Validator::make($request->all(), [
+        $rules = [
             'timezone'         => 'required|timezone',
             'pagination-items' => 'required|min:3|max:100|integer',
             'email'            => 'required|email|max:255|unique:users',
-        ]);
+        ];
+
+        // Allow the validator to pass the uniqueness check if the email hasn't changed
+        if ($request->input('email') === Auth::user()->email) {
+            $rules['email'] = 'required|email|max:255';
+        }
+
+        $validator = Validator::make($request->all(), $rules);
 
         if ($validator->fails()) {
             return redirect()->route('account.preferences')