From 17f0626eee25bdb1e816740c7132696b78e53e1c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20M=C3=BCller?= Date: Mon, 22 Aug 2016 14:16:26 +0200 Subject: [PATCH] =?utf8?q?[9.0]=20Best=20practice=20through=20out=20the=20?= =?utf8?q?web=20speak=20of=20a=20max=20avatar=20image=20size=20of=E2=80=A6?= =?utf8?q?=20(#25857)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * Best practice through out the web speak of a max avatar image size of 96 pixels * Respect size argument THX @felixboehm --- apps/dav/lib/carddav/converter.php | 2 +- lib/private/user/user.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dav/lib/carddav/converter.php b/apps/dav/lib/carddav/converter.php index c8d9b94c267..f64b6c6b769 100644 --- a/apps/dav/lib/carddav/converter.php +++ b/apps/dav/lib/carddav/converter.php @@ -161,7 +161,7 @@ class Converter { */ private function getAvatarImage(IUser $user) { try { - $image = $user->getAvatarImage(-1); + $image = $user->getAvatarImage(96); return $image; } catch (\Exception $ex) { return null; diff --git a/lib/private/user/user.php b/lib/private/user/user.php index 3199790dba0..c3d0baee80e 100644 --- a/lib/private/user/user.php +++ b/lib/private/user/user.php @@ -378,7 +378,7 @@ class User implements IUser { } $avatar = $this->avatarManager->getAvatar($this->uid); - $image = $avatar->get(-1); + $image = $avatar->get($size); if ($image) { return $image; } -- 2.39.5