From d6cbc24dad48b8e5bfa30b1f4c80cc060a365ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Mon, 13 Apr 2020 22:27:42 +0200 Subject: [PATCH] Fix issue#123 --- CHANGELOG.md | 3 ++- lib/Action/EmailSync.php | 8 ++------ lib/Action/NameSync.php | 8 ++------ 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52ddf73..ecad06f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] -### Added +### Fixed +- [issue#123](https://github.com/nextcloud/user_sql/issues/123) - sync exception - Duplicate entry ## [4.5.0] - 2020-04-13 ### Added diff --git a/lib/Action/EmailSync.php b/lib/Action/EmailSync.php index 2a6eb48..9f9ebaa 100644 --- a/lib/Action/EmailSync.php +++ b/lib/Action/EmailSync.php @@ -99,9 +99,7 @@ public function doAction(User $user) $this->config->setUserValue( $user->uid, "settings", "email", $user->email ); - \OC::$server->getUserManager()->get($user->uid)->triggerChange( - 'eMailAddress', $user->email, null - ); + \OC::$server->getUserManager()->get($user->uid)->setEMailAddress($user->email); } $result = true; @@ -123,9 +121,7 @@ public function doAction(User $user) $this->config->setUserValue( $user->uid, "settings", "email", $user->email ); - \OC::$server->getUserManager()->get($user->uid)->triggerChange( - 'eMailAddress', $user->email, null - ); + \OC::$server->getUserManager()->get($user->uid)->setEMailAddress($user->email); } $result = true; diff --git a/lib/Action/NameSync.php b/lib/Action/NameSync.php index caf6987..7b9602e 100644 --- a/lib/Action/NameSync.php +++ b/lib/Action/NameSync.php @@ -99,9 +99,7 @@ public function doAction(User $user) $this->config->setUserValue( $user->uid, "settings", "displayName", $user->name ); - \OC::$server->getUserManager()->get($user->uid)->triggerChange( - 'displayName', $user->name, null - ); + \OC::$server->getUserManager()->get($user->uid)->setDisplayName($user->name); } $result = true; @@ -123,9 +121,7 @@ public function doAction(User $user) $this->config->setUserValue( $user->uid, "settings", "displayName", $user->name ); - \OC::$server->getUserManager()->get($user->uid)->triggerChange( - 'displayName', $user->name, null - ); + \OC::$server->getUserManager()->get($user->uid)->setDisplayName($user->name); } $result = true;