user hash fix update

2 files changed, 4 insertions, 1 deletions

diff --git a/app/class/controlleruser.php b/app/class/controlleruser.php
index 8240d55..65fb2bc 100644
--- a/app/class/controlleruser.php
+++ b/app/class/controlleruser.php
@@ -72,6 +72,9 @@ class Controlleruser extends Controller
                     } elseif ($user->level() === 10 && $userupdate->level() !== 10 && $this->user->id() === $user->id()) {
                         $this->routedirectget('user', ['error' => 'cant_edit_yourself']);
                     } else {
+                        if($userupdate->password() !== $user->password() && $user->passwordhashed()) {
+                            $userupdate->setpasswordhashed(false);
+                        }
                         if($userupdate->passwordhashed() && !$user->passwordhashed()) {
                             $userupdate->hashpassword();
                         }
diff --git a/app/class/user.php b/app/class/user.php
index 2627d3d..9bfc071 100644
--- a/app/class/user.php
+++ b/app/class/user.php
@@ -82,7 +82,7 @@ class User
 
     public function setpassword(string $password)
     {
-        if (is_string($password)) {
+        if (is_string($password) && !empty($password)) {
             $this->password = $password;
         }