summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L <szaimen@e.mail.de>2022-12-28 13:17:35 +0100
committerGitHub <noreply@github.com>2022-12-28 13:17:35 +0100
commit8d53b82a2d2986241b621f12e59287a73db0d357 (patch)
treec739b3f312018377e84b352812fab1b32196f100
parent93dae8927abc730634b7348b7560008a21a20fc1 (diff)
parent73ca079d06804f0f8ba4fc70312333d82449db34 (diff)
downloadnextcloud-server-8d53b82a2d2986241b621f12e59287a73db0d357.tar.gz
nextcloud-server-8d53b82a2d2986241b621f12e59287a73db0d357.zip
Merge pull request #35895 from nextcloud/backport/35891/stable25
[stable25] avatar generation - disable setimageformat
-rw-r--r--lib/private/Avatar/Avatar.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Avatar/Avatar.php b/lib/private/Avatar/Avatar.php
index 9b9220936eb..791cb8b2e7f 100644
--- a/lib/private/Avatar/Avatar.php
+++ b/lib/private/Avatar/Avatar.php
@@ -135,7 +135,8 @@ abstract class Avatar implements IAvatar {
$avatar = new Imagick();
$avatar->setFont($font);
$avatar->readImageBlob($svg);
- $avatar->setImageFormat('png');
+ // Disabled since it breaks avatar generation on some instances
+ // $avatar->setImageFormat('png');
$image = new \OCP\Image();
$image->loadFromData((string)$avatar);
return $image->data();