From d394fb621a7b517f85cca8f03ea15f181973e443 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Nov 2011 18:05:45 +0100 Subject: [PATCH] Fix: Try to fix trigger tha change password --- htdocs/user/class/user.class.php | 4 +++- htdocs/user/fiche.php | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 97625b31622..50b0376a6aa 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1247,7 +1247,9 @@ class User extends CommonObject // Mise a jour if (! $changelater) { - $sql = "UPDATE ".MAIN_DB_PREFIX."user"; + if (! is_object($this->oldcopy)) $this->oldcopy=dol_clone($this); + + $sql = "UPDATE ".MAIN_DB_PREFIX."user"; $sql.= " SET pass_crypted = '".$this->db->escape($password_crypted)."',"; $sql.= " pass_temp = null"; if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 5dfa5aeb960..c8d07ec46fe 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -410,6 +410,8 @@ if ($action == 'update' && ! $_POST["cancel"]) $edituser = new User($db); $edituser->fetch($id); + $edituser->oldcopy=dol_clone($edituser); + $ret=$edituser->setPassword($user,$_POST["password"]); if ($ret < 0) {