(bug 18803) JPEG2000 images can no longer be uploaded as JPEG image. Done by adding...

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index d9950d3..2ebd04e 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -37,6 +37,7 @@ used in Tiff files.
 * (bug 23002) Imagelinks table not updated after imagemove.
 * (bug 27864) Transcluding {{Special:Prefix}} with empty prefix now lists all
   pages.
+* (bug 18803) JPEG2000 images can no longer be uploaded as JPEG image.
 
 === API changes in 1.19 ===
 * (bug 27790) add query type for querymodules to action=paraminfo

diff --git a/includes/mime.info b/includes/mime.info
index b802768..89952fa 100644 (file)
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -10,6 +10,7 @@ image/gif     [BITMAP]
 image/png image/x-png  [BITMAP]
 image/ief      [BITMAP]
 image/jpeg     [BITMAP]
+image/jp2      [BITMAP]
 image/xbm      [BITMAP]
 image/tiff     [BITMAP]
 image/x-icon   [BITMAP]

diff --git a/includes/mime.types b/includes/mime.types
index ad4489f..08b822f 100644 (file)
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -80,6 +80,7 @@ image/bmp bmp
 image/cgm cgm
 image/gif gif
 image/ief ief
+image/jp2 j2k jp2 jpg2
 image/jpeg jpeg jpg jpe
 image/png png apng
 image/svg+xml svg