From 519d5427e28ced4b9b5d710a74b81fb79e89efb3 Mon Sep 17 00:00:00 2001 From: Bryan Tong Minh Date: Wed, 29 Jun 2011 20:31:43 +0000 Subject: [PATCH] Per CR, revert non debugging stuff from r82436. (KML uploads) --- includes/DefaultSettings.php | 3 --- includes/Defines.php | 1 - includes/mime.info | 2 -- includes/mime.types | 2 -- 4 files changed, 8 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index f7e0e64155..d145f5ee12 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -850,9 +850,6 @@ $wgXMLMimeTypes = array( '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? - 'http://www.opengis.net/kml/2.1:kml' => 'application/vnd.google-earth.kml+xml', - 'http://www.opengis.net/kml/2.2:kml' => 'application/vnd.google-earth.kml+xml', - 'kml' => 'application/vnd.google-earth.kml+xml', ); /** diff --git a/includes/Defines.php b/includes/Defines.php index 4b52bf930d..a9b2e56512 100644 --- a/includes/Defines.php +++ b/includes/Defines.php @@ -120,7 +120,6 @@ define( 'MEDIATYPE_OFFICE', 'OFFICE' ); // Office Documents, Spreadshee define( 'MEDIATYPE_TEXT', 'TEXT' ); // Plain text (possibly containing program code or scripts) define( 'MEDIATYPE_EXECUTABLE', 'EXECUTABLE' ); // binary executable define( 'MEDIATYPE_ARCHIVE', 'ARCHIVE' ); // archive file (zip, tar, etc) -define( 'MEDIATYPE_DATA', 'DATA' ); // A generic data file (like kml and kmz) /**@}*/ /**@{ diff --git a/includes/mime.info b/includes/mime.info index 89952fafe7..d705715dc6 100644 --- a/includes/mime.info +++ b/includes/mime.info @@ -104,5 +104,3 @@ application/vnd.ms-excel.template.macroEnabled.12 [OFFICE] application/vnd.ms-excel.addin.macroEnabled.12 [OFFICE] application/vnd.ms-excel.sheet.binary.macroEnabled.12 [OFFICE] application/acad application/x-acad application/autocad_dwg image/x-dwg application/dwg application/x-dwg application/x-autocad image/vnd.dwg drawing/dwg [DRAWING] -application/vnd.google-earth.kml+xml [DATA] -application/vnd.google-earth.kmz [DATA] diff --git a/includes/mime.types b/includes/mime.types index 08b822f940..9e640322d8 100644 --- a/includes/mime.types +++ b/includes/mime.types @@ -162,5 +162,3 @@ application/vnd.ms-excel.sheet.binary.macroEnabled.12 xlsb model/vnd.dwfx+xps dwfx application/vnd.ms-xpsdocument xps application/x-opc+zip docx dotx docm dotm potx ppsx pptx ppam pptm potm ppsm xlsx xltx xlsm xltm xlam xlsb dwfx xps -application/vnd.google-earth.kml+xml kml -application/vnd.google-earth.kmz kmz -- 2.20.1