[Pkg-owncloud-commits] [owncloud] 01/16: fix uncaught exception on not permitted file types when setting avatar, fixes #17232

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit d44a6563a7483d24c3c8fa3a7e3d4753de853951
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Wed Jul 8 02:17:44 2015 +0200

    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 c81fb25b..ffcb16a 100644
--- a/apps/user_ldap/lib/user/user.php
+++ b/apps/user_ldap/lib/user/user.php
@@ -343,7 +343,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']);
+		}
 	}
 
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git