Skip to content

Commit 2a74988

Browse files
authored
Merge pull request #26282 from nextcloud/psalm/avatar/data
improve type handling of Avatar::generateAvatarFromSvg
2 parents 6e40c2f + db0e198 commit 2a74988

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

lib/private/Avatar/Avatar.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,9 @@ protected function generateAvatarFromSvg(int $size) {
156156
$avatar->readImageBlob($svg);
157157
$avatar->setImageFormat('png');
158158
$image = new OC_Image();
159-
$image->loadFromData($avatar);
160-
return $image->data();
159+
$image->loadFromData((string)$avatar);
160+
$data = $image->data();
161+
return $data === null ? false : $data;
161162
} catch (\Exception $e) {
162163
return false;
163164
}

0 commit comments

Comments
 (0)