Also adding application/x-dia-diagram to mime.{types,info}

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0f85cf9..2ca12bd 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
+* Added 'application/x-dia-diagram' MediaWiki's known MIME types
 
 === API changes in 1.13 ===
 

diff --git a/includes/mime.info b/includes/mime.info
index 7711f66..63b38f5 100644 (file)
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -1,9 +1,9 @@
-#Mime type info file.
-#the first mime type in each line is the "main" mime type,
-#the others are aliases for this type
-#the media type is given in upper case and square brackets,
-#like [BITMAP], and must indicate a media type as defined by
-#the MEDIATYPE_xxx constants in Defines.php
+# Mime type info file.
+# the first mime type in each line is the "main" mime type,
+# the others are aliases for this type
+# the media type is given in upper case and square brackets,
+# like [BITMAP], and must indicate a media type as defined by
+# the MEDIATYPE_xxx constants in Defines.php
 
 
 image/gif      [BITMAP]
@@ -24,6 +24,7 @@ image/svg+xml application/svg+xml application/svg image/svg   [DRAWING]
 application/postscript [DRAWING]
 application/x-latex    [DRAWING]
 application/x-tex      [DRAWING]
+application/x-dia-diagram [DRAWING]
 
 
 audio/mp3 audio/mpeg3 audio/mpeg       [AUDIO]

diff --git a/includes/mime.types b/includes/mime.types
index af54079..6021e92 100644 (file)
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -25,6 +25,7 @@ application/x-cdlink vcd
 application/x-chess-pgn pgn
 application/x-cpio cpio
 application/x-csh csh
+application/x-dia-diagram dia
 application/x-director dcr dir dxr
 application/x-dvi dvi
 application/x-futuresplash spl
@@ -115,4 +116,4 @@ video/x-flv flv
 video/x-msvideo avi
 video/x-ogg ogm ogg
 video/x-sgi-movie movie
-x-conference/x-cooltalk ice
\ No newline at end of file
+x-conference/x-cooltalk ice