Page MenuHomePhabricator
Files F7139

kmlsupport.patch
Public
Actions

Authored By
• bzimport
Nov 21 2014, 11:16 PM
Size
3 KB
Referenced Files
None
Subscribers
None

kmlsupport.patch
View Options

Index: includes/mime.info
===================================================================
--- includes/mime.info (revision 82013)
+++ includes/mime.info (working copy)
@@ -103,3 +103,6 @@
application/vnd.ms-excel.addin.macroEnabled.12 [OFFICE]
application/vnd.ms-excel.sheet.binary.macroEnabled.12 [OFFICE]
+application/vnd.google-earth.kml+xml [DATA]
+application/vnd.google-earth.kmz [DATA]
+
Index: includes/mime.types
===================================================================
--- includes/mime.types (revision 82013)
+++ includes/mime.types (working copy)
@@ -160,3 +160,5 @@
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
Index: includes/DefaultSettings.php
===================================================================
--- includes/DefaultSettings.php (revision 82013)
+++ includes/DefaultSettings.php (working copy)
@@ -881,6 +881,9 @@
'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',
);
/**
Index: includes/Defines.php
===================================================================
--- includes/Defines.php (revision 82013)
+++ includes/Defines.php (working copy)
@@ -126,6 +126,7 @@
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)
/**@}*/
/**@{
Index: includes/upload/UploadBase.php
===================================================================
--- includes/upload/UploadBase.php (revision 82013)
+++ includes/upload/UploadBase.php (working copy)
@@ -858,6 +858,7 @@
foreach( $tags as $tag ) {
if( false !== strpos( $chunk, $tag ) ) {
+wfDebug( __METHOD__ . ": found something that may make it be mistaken for html: $tag\n" );
return true;
}
}
@@ -871,16 +872,19 @@
# look for script-types
if( preg_match( '!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk ) ) {
+wfDebug( __METHOD__ . ": found script types\n" );
return true;
}
# look for html-style script-urls
if( preg_match( '!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk ) ) {
+wfDebug( __METHOD__ . ": found html-style script urls\n" );
return true;
}
# look for css-style script-urls
if( preg_match( '!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk ) ) {
+wfDebug( __METHOD__ . ": found css-style script urls\n" );
return true;
}

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
6675
Default Alt Text
kmlsupport.patch (3 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL