diff options
| author | blizzz <blizzz@owncloud.com> | 2015-11-02 13:32:24 +0100 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2015-11-02 13:32:24 +0100 |
| commit | 83d3c94590aa877fe23a5d49c991e617d76a6060 (patch) | |
| tree | 88813a6c5e13381bf8a23723862a6b7d7ea56a92 /apps/user_ldap/lib/access.php | |
| parent | 16aa33947581959eeb9a89530ad0152cb2c33c25 (diff) | |
| parent | a8641fdc9559d67696fb612597c4b27d1832220a (diff) | |
| download | nextcloud-server-83d3c94590aa877fe23a5d49c991e617d76a6060.tar.gz nextcloud-server-83d3c94590aa877fe23a5d49c991e617d76a6060.zip | |
Merge branch 'master' into fix-20151
Diffstat (limited to 'apps/user_ldap/lib/access.php')
| -rw-r--r-- | apps/user_ldap/lib/access.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 8a6e3c6726f..d4f4eaddcb3 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -35,6 +35,7 @@ namespace OCA\user_ldap\lib; +use OCA\user_ldap\lib\user\OfflineUser; use OCA\User_LDAP\Mapping\AbstractMapping; /** @@ -710,6 +711,10 @@ class Access extends LDAPUtility implements user\IUserTools { $ocName = $this->dn2ocname($userRecord['dn'][0], $userRecord[$displayNameAttribute]); $this->cacheUserExists($ocName); $user = $this->userManager->get($ocName); + if($user instanceof OfflineUser) { + $user->unmark(); + $user = $this->userManager->get($ocName); + } $user->processAttributes($userRecord); } } |