Revert r28215: incorrectly moved files

[lhc/web/wiklou.git] / includes / MimeMagic.php

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index c4c6cf1..fd42499 100644 (file)
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -24,7 +24,7 @@ image/jpeg jpeg jpg jpe
 image/png png
 image/svg+xml image/svg svg
 image/tiff tiff tif
-image/vnd.djvu djvu
+image/vnd.djvu image/x.djvu image/x-djvu djvu
 image/x-portable-pixmap ppm
 text/plain txt
 text/html html htm
@@ -374,7 +374,9 @@ class MimeMagic {
                $mime = $this->detectMimeType( $file, $ext );
 
                // Read a chunk of the file
+               wfSuppressWarnings();
                $f = fopen( $file, "rt" );
+               wfRestoreWarnings();
                if( !$f ) return "unknown/unknown";
                $head = fread( $f, 1024 );
                fclose( $f );