summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <DeepDiver1975@users.noreply.github.com>2016-08-22 14:16:26 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2016-08-22 14:17:01 +0200
commit4c7135a44da41c460d3cd2f70a6a237dacb55466 (patch)
treecf23433bc30be37fe5385c97f4efe4e88850af00
parent20aa7ee2804591de14b6464d82c98325dd260ed6 (diff)
downloadnextcloud-server-4c7135a44da41c460d3cd2f70a6a237dacb55466.tar.gz
nextcloud-server-4c7135a44da41c460d3cd2f70a6a237dacb55466.zip
[stable9.1] Best practice through out the web speak of a max avatar image size of… (#25857)
* Best practice through out the web speak of a max avatar image size of 96 pixels * Respect size argument THX @felixboehm
-rw-r--r--apps/dav/lib/CardDAV/Converter.php2
-rw-r--r--lib/private/User/User.php2
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 a48941ea2c0..aa6277ca2a9 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;
}