Merge remote-tracking branch 'origin/master' into develop

Author: snipe

app/Models/User.php

@@ -237,11 +237,14 @@ public function hasIndividualPermissions()
             $permissions = json_decode($this->permissions, true);
         }
 
-        foreach ($permissions as $permission) {
-            if ($permission != 0) {
-                return true;
+        if (($permissions) && (is_array($permissions))) {
+            foreach ($permissions as $permission) {
+                if ($permission != 0) {
+                    return true;
+                }
             }
         }
+
         return false;
     }
 

app/Observers/UserObserver.php

@@ -49,7 +49,8 @@ public function updating(User $user)
             'end_date',
             'autoassign_licenses',
             'vip',
-            'password'
+            'password',
+            'permissions'
         ];
 
         $changed = [];