7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
André Peters
2018-02-16 22:44:02 +01:00
parent 0bfd0838c2 2a3040de12
commit 1f09544f32
13 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/web/inc/functions.inc.php
View File

@@ -415,7 +415,7 @@ function edit_user_account($postarray) {
}
$password_hashed = hash_password($password_new);
try {
$stmt = $pdo->prepare("UPDATE `mailbox` SET `password` = :password_hashed WHERE `username` = :username");
$stmt = $pdo->prepare("UPDATE `mailbox` SET `password` = :password_hashed, `attributes` = JSON_SET(`attributes`, '$.force_pw_update', '0') WHERE `username` = :username");
$stmt->execute(array(
':password_hashed' => $password_hashed,
':username' => $username