From 5a20e20e9ea9adbabe73afa5d2096575de5503ea Mon Sep 17 00:00:00 2001 From: Côme Chilliet Date: Mon, 25 Oct 2021 16:17:27 +0200 Subject: Fix errors in AvatarController when data() returns null MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- core/Controller/AvatarController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'core/Controller/AvatarController.php') diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php index 3b87bf15b2f..5acfe9cd404 100644 --- a/core/Controller/AvatarController.php +++ b/core/Controller/AvatarController.php @@ -283,11 +283,12 @@ class AvatarController extends Controller { $image = new \OC_Image(); $image->loadFromData($tmpAvatar); - $resp = new DataDisplayResponse($image->data(), + $resp = new DataDisplayResponse( + $image->data() ?? '', Http::STATUS_OK, ['Content-Type' => $image->mimeType()]); - $resp->setETag((string)crc32($image->data())); + $resp->setETag((string)crc32($image->data() ?? '')); $resp->cacheFor(0); $resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT'))); return $resp; -- cgit v1.2.3