diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-06 17:04:16 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-06 17:04:16 +0100 |
| commit | 8b5315c90a57cd3605acc494d528dabb55d8f1d3 (patch) | |
| tree | d27649b02f9f30a1e1a4348e64c58a3bfe4001cd | |
| parent | 6460448b10caf626c2f9fb32f3eab9fd7802e7ae (diff) | |
| parent | 553a981980571930a935a2e85895396f2813ae44 (diff) | |
| download | nextcloud-server-8b5315c90a57cd3605acc494d528dabb55d8f1d3.tar.gz nextcloud-server-8b5315c90a57cd3605acc494d528dabb55d8f1d3.zip | |
Merge pull request #21459 from owncloud/make-ldap-more-robust
Make LDAP more robust to exceptions and log them properly
| -rw-r--r-- | apps/user_ldap/lib/user/user.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/user_ldap.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php index 0dc3c8c0c26..7a121920a35 100644 --- a/apps/user_ldap/lib/user/user.php +++ b/apps/user_ldap/lib/user/user.php @@ -474,8 +474,8 @@ class User { $this->fs->setup($this->uid); } - $avatar = $this->avatarManager->getAvatar($this->uid); try { + $avatar = $this->avatarManager->getAvatar($this->uid); $avatar->set($this->image); } catch (\Exception $e) { \OC::$server->getLogger()->notice( diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index a266be7b7f7..c568905f3d9 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -118,6 +118,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn try { $ldapRecord = $this->getLDAPUserByLoginName($uid); } catch(\Exception $e) { + \OC::$server->getLogger()->logException($e, ['app' => 'user_ldap']); return false; } $dn = $ldapRecord['dn'][0]; |