From 82194cef8aa6a2554bae8a6872bfe76b6eb7a361 Mon Sep 17 00:00:00 2001
From: Daniel Meltzer <dmeltzer.devel@gmail.com>
Date: Sun, 22 Jul 2018 02:02:06 -0400
Subject: [PATCH] bugfix: updating a user when an admin (not a superuser) would
 remove any groups from the user. (#5914)

---
 app/Http/Controllers/UsersController.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index 24bc859204..c8e580273a 100755
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -247,9 +247,10 @@ class UsersController extends Controller
                 }
             }
 
-        } catch (UserNotFoundException $e) {
-            $error = trans('admin/users/message.user_not_found', compact('id'));
-            return redirect()->route('users.index')->with('error', $error);
+
+        } catch (ModelNotFoundException $e) {
+            return redirect()->route('users.index')
+                ->with('error', trans('admin/users/message.user_not_found', compact('id')))
         }
 
 
@@ -257,8 +258,6 @@ class UsersController extends Controller
         if (Auth::user()->isSuperUser()) {
             if ($request->has('groups')) {
                 $user->groups()->sync($request->input('groups'));
-            } else {
-                $user->groups()->sync(array());
             }
         }