Skip to content

Commit d6cbc24

Browse files
committed
Fix issue#123
1 parent 765eeab commit d6cbc24

3 files changed

Lines changed: 6 additions & 13 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8-
### Added
8+
### Fixed
9+
- [issue#123](https://github.com/nextcloud/user_sql/issues/123) - sync exception - Duplicate entry
910

1011
## [4.5.0] - 2020-04-13
1112
### Added

lib/Action/EmailSync.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ public function doAction(User $user)
9999
$this->config->setUserValue(
100100
$user->uid, "settings", "email", $user->email
101101
);
102-
\OC::$server->getUserManager()->get($user->uid)->triggerChange(
103-
'eMailAddress', $user->email, null
104-
);
102+
\OC::$server->getUserManager()->get($user->uid)->setEMailAddress($user->email);
105103
}
106104

107105
$result = true;
@@ -123,9 +121,7 @@ public function doAction(User $user)
123121
$this->config->setUserValue(
124122
$user->uid, "settings", "email", $user->email
125123
);
126-
\OC::$server->getUserManager()->get($user->uid)->triggerChange(
127-
'eMailAddress', $user->email, null
128-
);
124+
\OC::$server->getUserManager()->get($user->uid)->setEMailAddress($user->email);
129125
}
130126

131127
$result = true;

lib/Action/NameSync.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ public function doAction(User $user)
9999
$this->config->setUserValue(
100100
$user->uid, "settings", "displayName", $user->name
101101
);
102-
\OC::$server->getUserManager()->get($user->uid)->triggerChange(
103-
'displayName', $user->name, null
104-
);
102+
\OC::$server->getUserManager()->get($user->uid)->setDisplayName($user->name);
105103
}
106104

107105
$result = true;
@@ -123,9 +121,7 @@ public function doAction(User $user)
123121
$this->config->setUserValue(
124122
$user->uid, "settings", "displayName", $user->name
125123
);
126-
\OC::$server->getUserManager()->get($user->uid)->triggerChange(
127-
'displayName', $user->name, null
128-
);
124+
\OC::$server->getUserManager()->get($user->uid)->setDisplayName($user->name);
129125
}
130126

131127
$result = true;

0 commit comments

Comments
 (0)