spacefreak/user_sql
1
0
Fork 0
Code Pull Requests Activity

Fix issue#123

Browse Source
This commit is contained in:
Marcin Łojewski
2020-04-13 22:27:42 +02:00
parent 765eeab6c0
commit d6cbc24dad
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -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). and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [Unreleased]
### Added ### Fixed
- [issue#123](https://github.com/nextcloud/user_sql/issues/123) - sync exception - Duplicate entry
## [4.5.0] - 2020-04-13 ## [4.5.0] - 2020-04-13
### Added ### Added

8
lib/Action/EmailSync.php
View File

@@ -99,9 +99,7 @@ class EmailSync implements IUserAction
$this->config->setUserValue( $this->config->setUserValue(
$user->uid, "settings", "email", $user->email $user->uid, "settings", "email", $user->email
); );
\OC::$server->getUserManager()->get($user->uid)->triggerChange( \OC::$server->getUserManager()->get($user->uid)->setEMailAddress($user->email);
'eMailAddress', $user->email, null
);
} }
$result = true; $result = true;
@@ -123,9 +121,7 @@ class EmailSync implements IUserAction
$this->config->setUserValue( $this->config->setUserValue(
$user->uid, "settings", "email", $user->email $user->uid, "settings", "email", $user->email
); );
\OC::$server->getUserManager()->get($user->uid)->triggerChange( \OC::$server->getUserManager()->get($user->uid)->setEMailAddress($user->email);
'eMailAddress', $user->email, null
);
} }
$result = true; $result = true;

8
lib/Action/NameSync.php
View File

@@ -99,9 +99,7 @@ class NameSync implements IUserAction
$this->config->setUserValue( $this->config->setUserValue(
$user->uid, "settings", "displayName", $user->name $user->uid, "settings", "displayName", $user->name
); );
\OC::$server->getUserManager()->get($user->uid)->triggerChange( \OC::$server->getUserManager()->get($user->uid)->setDisplayName($user->name);
'displayName', $user->name, null
);
} }
$result = true; $result = true;
@@ -123,9 +121,7 @@ class NameSync implements IUserAction
$this->config->setUserValue( $this->config->setUserValue(
$user->uid, "settings", "displayName", $user->name $user->uid, "settings", "displayName", $user->name
); );
\OC::$server->getUserManager()->get($user->uid)->triggerChange( \OC::$server->getUserManager()->get($user->uid)->setDisplayName($user->name);
'displayName', $user->name, null
);
} }
$result = true; $result = true;