Merge pull request #27124 from nextcloud/backport/26282/stable21
[stable21] improve type handling of Avatar::generateAvatarFromSvg
This commit is contained in:
commit
afd58bd4bc
|
@ -156,8 +156,9 @@ abstract class Avatar implements IAvatar {
|
||||||
$avatar->readImageBlob($svg);
|
$avatar->readImageBlob($svg);
|
||||||
$avatar->setImageFormat('png');
|
$avatar->setImageFormat('png');
|
||||||
$image = new OC_Image();
|
$image = new OC_Image();
|
||||||
$image->loadFromData($avatar);
|
$image->loadFromData((string)$avatar);
|
||||||
return $image->data();
|
$data = $image->data();
|
||||||
|
return $data === null ? false : $data;
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue