From b5c5b9d6b9a5661ad8ed88786f0a8083df9e8493 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Wed, 11 Jul 2018 11:15:44 +0200
Subject: [PATCH] FEAT #7659 Fix history and change pass
---
src/app/user/models/UserModelAbstract.php | 3 ++-
src/core/models/PasswordModel.php | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/app/user/models/UserModelAbstract.php b/src/app/user/models/UserModelAbstract.php
index 59d6d63f237..dd2ede28b6f 100644
--- a/src/app/user/models/UserModelAbstract.php
+++ b/src/app/user/models/UserModelAbstract.php
@@ -172,7 +172,8 @@ abstract class UserModelAbstract
'table' => 'users',
'set' => [
'password' => SecurityModel::getPasswordHash($aArgs['password']),
- 'password_modification_date' => 'CURRENT_TIMESTAMP'
+ 'password_modification_date' => 'CURRENT_TIMESTAMP',
+ 'change_password' => 'N',
],
'where' => ['id = ?'],
'data' => [$aArgs['id']]
diff --git a/src/core/models/PasswordModel.php b/src/core/models/PasswordModel.php
index 8317b716538..3023f037ec0 100644
--- a/src/core/models/PasswordModel.php
+++ b/src/core/models/PasswordModel.php
@@ -132,7 +132,7 @@ class PasswordModel
DatabaseModel::delete([
'table' => 'password_history',
'where' => ['id < ?', 'user_serial_id = ?'],
- 'data' => [$passwordHistory[8], $aArgs['userSerialId']]
+ 'data' => [$passwordHistory[8]['id'], $aArgs['userSerialId']]
]);
}
--
GitLab