Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/avatarlink.php b/lib/avatarlink.php
index 6e3f050960a7f054520c442bd04fc7a6d6aaea8f..8bb29855a3a59c66196189e7c070bdfe8933d4f2 100644 (file)
--- a/lib/avatarlink.php
+++ b/lib/avatarlink.php
@@ -85,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';
         }