Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x

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

diff --git a/lib/mediafile.php b/lib/mediafile.php
index a41d7c76b52d190e066e3b093570b67ad08d1f26..caa902de5dfeb13c18413372769198b9af209241 100644 (file)
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -362,7 +362,9 @@ class MediaFile
         // we'll try detecting a type from its extension...
         $unclearTypes = array('application/octet-stream',
                               'application/vnd.ms-office',
-                              'application/zip');
+                              'application/zip',
+                              // TODO: for XML we could do better content-based sniffing too
+                              'text/xml');
 
         if ($originalFilename && (!$filetype || in_array($filetype, $unclearTypes))) {
             $type = $mte->getMIMEType($originalFilename);