* * Added 'application/x-dia-diagram' to XML MIME types. Patch by dpy

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5d6b4a9..0f85cf9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -216,7 +216,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13816) Filter by main namespace doesn't work on WhatLinksHere
 * (bug 13822) Fatal error on some pages when calculating subpage subtitle
 * (bug 13824) AJAX search suggestion now works with non-SkinTemplate skins
-
+* Added 'application/x-dia-diagram' to XML MIME types
 
 === API changes in 1.13 ===
 

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index e4af1f0..e7c30ed 100644 (file)
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -458,10 +458,11 @@ class MimeMagic {
                $xml = new XmlTypeCheck( $file );
                if( $xml->wellFormed ) {
                        $types = array(
-                               'http://www.w3.org/2000/svg:svg'    => 'image/svg+xml',
-                               'svg'                               => 'image/svg+xml',
-                               'http://www.w3.org/1999/xhtml:html' => 'text/html', // application/xhtml+xml?
-                               'html'                              => 'text/html', // application/xhtml+xml?
+                               'http://www.w3.org/2000/svg:svg'                => 'image/svg+xml',
+                               'svg'                                           => 'image/svg+xml',
+                               'http://www.lysator.liu.se/~alla/dia/:diagram'  => 'application/x-dia-diagram',
+                               'http://www.w3.org/1999/xhtml:html'             => 'text/html', // application/xhtml+xml?
+                               'html'                                          => 'text/html', // application/xhtml+xml?
                        );
                        if( isset( $types[$xml->rootElement] ) ) {
                                $mime = $types[$xml->rootElement];