From adb89e7f3bb409617bcaff924e17cab7ebf6f781 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 1 Oct 2007 20:23:14 +0000 Subject: [PATCH] * Compatibility with incorrectly detected old-style DJVU mime types --- RELEASE-NOTES | 1 + includes/DefaultSettings.php | 8 +++++--- includes/MimeMagic.php | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 98bae4faf4..c2e0f30949 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -80,6 +80,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 11474) Fix unintentional fall-through in math error handling * (bug 11478) Fix undefined method call in file deletion interface * (bug 278) Search results no longer highlight incorrect partial word matches +* Compatibility with incorrectly detected old-style DJVU mime types === API changes in 1.12 === diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 17c31aeb30..7bb13de1ec 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1603,9 +1603,11 @@ $wgMediaHandlers = array( 'image/png' => 'BitmapHandler', 'image/gif' => 'BitmapHandler', 'image/x-ms-bmp' => 'BmpHandler', - 'image/svg+xml' => 'SvgHandler', - 'image/svg' => 'SvgHandler', - 'image/vnd.djvu' => 'DjVuHandler', + 'image/svg+xml' => 'SvgHandler', // official + 'image/svg' => 'SvgHandler', // compat + 'image/vnd.djvu' => 'DjVuHandler', // official + 'image/x.djvu' => 'DjVuHandler', // compat + 'image/x-djvu' => 'DjVuHandler', // compat ); diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php index 264a3595c7..fd42499bc8 100644 --- 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 -- 2.20.1