refactor

evocms-community · Sep 24, 2023 · caf21cd · caf21cd
1 parent f181671
commit caf21cd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Services/Users/UserEdit.php b/src/Services/Users/UserEdit.php
@@ -100,7 +100,10 @@ public function process(): \Illuminate\Database\Eloquent\Model
         if (!$this->checkRules()) {
             throw new ServiceActionException(\Lang::get('global.error_no_privileges'));
         }
-
+
+        $user = User::find($this->userData['id']);
+        $this->userData = array_merge($user->toArray() + $user->attributes->toArray(), $this->userData);
+
         // invoke OnBeforeUserFormSave event
         if ($this->events) {
             EvolutionCMS()->invokeEvent("OnBeforeUserSave", [
@@ -116,7 +119,7 @@ public function process(): \Illuminate\Database\Eloquent\Model
             $exception->setValidationErrors($this->validateErrors);
             throw $exception;
         }
-        $user = User::find($this->userData['id']);
+
         if (isset($this->userData['username']) && $this->userData['username'] != '') {
             $user->username = $this->userData['username'];
             $user->save();