Removed plugin Google-Analytics as this is free/libre and decentralized

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

diff --git a/lib/avatarlink.php b/lib/avatarlink.php
index 7d4256d6e10ab4979e741e274c9ac3ef4827d66b..8bb29855a3a59c66196189e7c070bdfe8933d4f2 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;
@@ -88,7 +85,8 @@ class AvatarLink
 
     // yuck!
     static function mediatype($filename) {
-        $ext = strtolower(end(explode('.', $filename)));
+        $parts = explode('.', $filename);
+        $ext = strtolower(end($parts));
         if ($ext == 'jpeg') {
             $ext = 'jpg';
         }