From 2054b0c4314a80c6f6eaaca90f4ac22839c10753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ducoulombier?= Date: Tue, 30 Jun 2020 16:25:55 +0200 Subject: [PATCH 1/2] updateUserFromLDAP does not reset picture_url - refs BT#17483 nor auth_source, official_code, phone, expiration_date, active, creator_id, hr_dept_id, language. --- main/inc/lib/usermanager.lib.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index a7f2b7f657..87a7ef723d 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -864,18 +864,18 @@ class UserManager $user["lastname"], $login, null, - null, + $userInfo['auth_source'], $user["email"], $userInfo['status'], - '', - '', - '', - null, - 1, - null, + $userInfo['official_code'], + $userInfo['phone'], + $userInfo['picture_uri'], + $userInfo['expiration_date'], + $userInfo['active'], + $userInfo['creator_id'], + $userInfo['hr_dept_id'], 0, - null, - '' + $userInfo['language'] ); if (false === $userId) { throw new Exception(get_lang('CouldNotUpdateUser')); From 5a8b0ba2d9adc6bc18674d6f37cc4762cd282a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ducoulombier?= Date: Tue, 30 Jun 2020 17:04:56 +0200 Subject: [PATCH 2/2] avoid resetting extra fields - refs BT#17483 --- main/inc/lib/usermanager.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 87a7ef723d..6b84abe7fb 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -874,7 +874,7 @@ class UserManager $userInfo['active'], $userInfo['creator_id'], $userInfo['hr_dept_id'], - 0, + null, $userInfo['language'] ); if (false === $userId) {