Merge pull request #1 from BookStackApp/master

[bookstack] / app / Http / Controllers / UserController.php

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 1367f631bcc0772c35ad470a6f3aac887189ec72..570896ab60712fb3eb80900e5a26c3287b8b6b9f 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -146,7 +146,12 @@ class UserController extends Controller
         ]);
 
         $user = $this->userRepo->getById($id);
         ]);
 
         $user = $this->userRepo->getById($id);

-        $user->fill($request->all());
+        $user->fill($request->except(['email']));
+
+        // Email updates
+        if (userCan('users-manage') && $request->filled('email')) {
+            $user->email = $request->get('email');
+        }

 
         // Role updates
         if (userCan('users-manage') && $request->filled('roles')) {
 
         // Role updates
         if (userCan('users-manage') && $request->filled('roles')) {


@@ -368,5 +373,4 @@ class UserController extends Controller
 
         return redirect()->back(302, [], "/settings/users/$userId");
     }
 
         return redirect()->back(302, [], "/settings/users/$userId");
     }

-

 }
 }