X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Favatarlink.php;h=8bb29855a3a59c66196189e7c070bdfe8933d4f2;hb=73dbc5ca1b203758693f73d6423fea71ef6b6fb6;hp=7d4256d6e10ab4979e741e274c9ac3ef4827d66b;hpb=c038164c0f41ba5c33f578f395c9fede80d96db8;p=quix0rs-gnu-social.git diff --git a/lib/avatarlink.php b/lib/avatarlink.php index 7d4256d6e1..8bb29855a3 100644 --- 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'; }