From b37d62d9d32ed44b8086fd75f6dcb9a66fb0955d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 8 Jul 2015 02:17:44 +0200
Subject: [PATCH] fix uncaught exception on not permitted file types when
setting avatar, fixes #17232
---
apps/user_ldap/lib/user/user.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php
index 54ee7a9b54..ac5d8f5a37 100644
--- a/apps/user_ldap/lib/user/user.php
+++ b/apps/user_ldap/lib/user/user.php
@@ -342,7 +342,13 @@ class User {
}
$avatar = $this->avatarManager->getAvatar($this->uid);
- $avatar->set($this->image);
+ try {
+ $avatar->set($this->image);
+ } catch (\Exception $e) {
+ \OC::$server->getLogger()->notice(
+ 'Could not set avatar for ' . $this->dn . ', because: ' . $e->getMessage(),
+ ['app' => 'user_ldap']);
+ }
}
}
--
GitLab