improve type handling of Avatar::generateAvatarFromSv

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/Avatar/Avatar.php b/lib/private/Avatar/Avatar.php
index 02fc04eae3663c8c0eec0f066aa64a735f334db2..a7395362ff6d177e22f1085ba71a85d828f5e466 100644 (file)
--- a/lib/private/Avatar/Avatar.php
+++ b/lib/private/Avatar/Avatar.php
@@ -156,8 +156,9 @@ abstract class Avatar implements IAvatar {
                        $avatar->readImageBlob($svg);
                        $avatar->setImageFormat('png');
                        $image = new OC_Image();
-                       $image->loadFromData($avatar);
-                       return $image->data();
+                       $image->loadFromData((string)$avatar);
+                       $data = $image->data();
+                       return $data === null ? false : $data;
                } catch (\Exception $e) {
                        return false;
                }