Merge branch 'group-autocomplete' into 'nightly'

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

diff --git a/lib/mediafile.php b/lib/mediafile.php
index 9fe5432ad503273c47d35160a481dc84b6c5d3e7..1e0fb39769953ba772ae6916e6cf7593136c75d6 100644 (file)
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -253,15 +253,15 @@ class MediaFile
             File::respectsQuota($scoped, $_FILES[$param]['size']);
 
             $mimetype = self::getUploadedMimeType($_FILES[$param]['tmp_name'], $_FILES[$param]['name']);
+            $basename = basename($_FILES[$param]['name']);
 
             switch (common_config('attachments', 'filename_base')) {
             case 'upload':
-                $basename = basename($_FILES[$param]['name']);
                 $filename = File::filename($scoped, $basename, $mimetype);
                 break;
             case 'hash':
             default:
-                $filename = strtolower($filehash) . '.' . File::guessMimeExtension($mimetype); 
+                $filename = strtolower($filehash) . '.' . File::guessMimeExtension($mimetype, $basename);
             }
             $filepath = File::path($filename);