diff options
author | Robin Appelman <icewind@owncloud.com> | 2016-03-11 13:44:35 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2016-03-11 13:44:35 +0100 |
commit | 54e750ba7845d0333cdb0fdccdb54f1432b2c161 (patch) | |
tree | 9b2056424ea8a75e06581e95abdbca90da60829c /lib/private/avatarmanager.php | |
parent | 750ec93394b76a3af4d45b32fd3b4dd788d431cf (diff) | |
download | nextcloud-server-54e750ba7845d0333cdb0fdccdb54f1432b2c161.tar.gz nextcloud-server-54e750ba7845d0333cdb0fdccdb54f1432b2c161.zip |
dont die when we cant save the resized avatar, log instead
Diffstat (limited to 'lib/private/avatarmanager.php')
-rw-r--r-- | lib/private/avatarmanager.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/private/avatarmanager.php b/lib/private/avatarmanager.php index 3b619cda574..62f4faf436c 100644 --- a/lib/private/avatarmanager.php +++ b/lib/private/avatarmanager.php @@ -28,6 +28,7 @@ namespace OC; use OCP\Files\Folder; use OCP\Files\NotFoundException; use OCP\IAvatarManager; +use OCP\ILogger; use OCP\IUserManager; use OCP\Files\IRootFolder; use OCP\IL10N; @@ -46,20 +47,26 @@ class AvatarManager implements IAvatarManager { /** @var IL10N */ private $l; + /** @var ILogger */ + private $logger; + /** * AvatarManager constructor. * * @param IUserManager $userManager * @param IRootFolder $rootFolder * @param IL10N $l + * @param ILogger $logger */ public function __construct( IUserManager $userManager, IRootFolder $rootFolder, - IL10N $l) { + IL10N $l, + ILogger $logger) { $this->userManager = $userManager; $this->rootFolder = $rootFolder; $this->l = $l; + $this->logger = $logger; } /** @@ -85,6 +92,6 @@ class AvatarManager implements IAvatarManager { /** @var Folder $folder */ $folder = $this->rootFolder->get($dir); - return new Avatar($folder, $this->l, $user); + return new Avatar($folder, $this->l, $user, $this->logger); } } |