From: Leon Weber <leon@users.mediawiki.org>
Date: Sun, 27 Apr 2008 13:28:55 +0000 (+0000)
Subject: * * Added 'application/x-dia-diagram' to XML MIME types. Patch by dpy
X-Git-Tag: 1.31.0-rc.0~48049
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=5677670d272b2f059b4d7698c9ffb9c67e0c9b97;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5d6b4a9348..0f85cf911b 100644
--- 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 e4af1f00a7..e7c30edd9f 100644
--- 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];