Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / lib / avatarlink.php

diff --git a/lib/avatarlink.php b/lib/avatarlink.php
index e67799e2ebee46f454fa67d7efd8bfe0c61b0d50..6e3f050960a7f054520c442bd04fc7a6d6aaea8f 100644 (file)
--- a/lib/avatarlink.php
+++ b/lib/avatarlink.php
@@ -58,11 +58,8 @@ class AvatarLink
         }
     }
 
-    static function fromAvatar($avatar)
+    static function fromAvatar(Avatar $avatar)
     {
-        if (empty($avatar)) {
-            return null;
-        }
         $alink = new AvatarLink();
         $alink->type   = $avatar->mediatype;
         $alink->height = $avatar->height;
@@ -76,8 +73,8 @@ class AvatarLink
         $alink = new AvatarLink();
         $alink->url    = $filename;
         $alink->height = $size;
+        $alink->width  = $size;
         if (!empty($filename)) {
-            $alink->width  = $size;
             $alink->type   = self::mediatype($filename);
         } else {
             $alink->url    = User_group::defaultLogo($size);