Skip to content

A free open source IT asset/license management system

Use has instead of filled for email, username, etc

snipe0a4ec8487518
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index ae7d8351a7..ac72968a43 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -554,22 +554,22 @@ class UsersController extends Controller
$user->password = bcrypt($request->input('password'));
}
- if ($request->filled('username')) {
+ // We need to use has() instead of filled()
+ // here because we need to overwrite permissions
+ // if someone needs to null them out
+
+ if ($request->has('username')) {
$user->username = $request->input('username');
}
- if ($request->filled('email')) {
+ if ($request->has('email')) {
$user->email = $request->input('email');
}
- if ($request->filled('activated')) {
+ if ($request->has('activated')) {
$user->activated = $request->input('activated');
}
- // We need to use has() instead of filled()
- // here because we need to overwrite permissions
- // if someone needs to null them out
-
if ($request->has('permissions')) {
$permissions_array = $request->input('permissions');