Ticket #15735: ooxmlfiletypes.2.patch

wp-includes/functions.php

@@ -2478 +2478 @@
         if ( !$mimes ) {
                 // Accepted MIME types are set here as PCRE unless provided.
                 $mimes = apply_filters( 'upload_mimes', array(
+                // image formats
                 'jpg|jpeg|jpe' => 'image/jpeg',
                 'gif' => 'image/gif',
                 'png' => 'image/png',
                 'bmp' => 'image/bmp',
                 'tif|tiff' => 'image/tiff',
                 'ico' => 'image/x-icon',
+                // video formats
                 'asf|asx|wax|wmv|wmx' => 'video/asf',
                 'avi' => 'video/avi',
                 'divx' => 'video/divx',
                 'flv' => 'video/x-flv',
                 'mov|qt' => 'video/quicktime',
                 'mpeg|mpg|mpe' => 'video/mpeg',
+                'mp4|m4v' => 'video/mp4',
+                'ogv' => 'video/ogg',
+                'mkv' => 'video/x-matroska',
+                // text formats
                 'txt|asc|c|cc|h' => 'text/plain',
                 'csv' => 'text/csv',
                 'tsv' => 'text/tab-separated-values',
                 'rtx' => 'text/richtext',
                 'css' => 'text/css',
                 'htm|html' => 'text/html',
+                // audio formats
                 'mp3|m4a|m4b' => 'audio/mpeg',
-                'mp4|m4v' => 'video/mp4',
                 'ra|ram' => 'audio/x-realaudio',
                 'wav' => 'audio/wav',
                 'ogg|oga' => 'audio/ogg',
-                'ogv' => 'video/ogg',
                 'mid|midi' => 'audio/midi',
                 'wma' => 'audio/wma',
                 'mka' => 'audio/x-matroska',
-                'mkv' => 'video/x-matroska',
+                // misc application formats
                 'rtf' => 'application/rtf',
                 'js' => 'application/javascript',
                 'pdf' => 'application/pdf',
-                'doc|docx' => 'application/msword',
-                'pot|pps|ppt|pptx|ppam|pptm|sldm|ppsm|potm' => 'application/vnd.ms-powerpoint',
-                'wri' => 'application/vnd.ms-write',
-                'xla|xls|xlsx|xlt|xlw|xlam|xlsb|xlsm|xltm' => 'application/vnd.ms-excel',
-                'mdb' => 'application/vnd.ms-access',
-                'mpp' => 'application/vnd.ms-project',
-                'docm|dotm' => 'application/vnd.ms-word',
-                'pptx|sldx|ppsx|potx' => 'application/vnd.openxmlformats-officedocument.presentationml',
-                'xlsx|xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml',
-                'docx|dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml',
-                'onetoc|onetoc2|onetmp|onepkg' => 'application/onenote',
                 'swf' => 'application/x-shockwave-flash',
                 'class' => 'application/java',
                 'tar' => 'application/x-tar',
                 'zip' => 'application/zip',
                 'gz|gzip' => 'application/x-gzip',
                 'exe' => 'application/x-msdownload',
+                // msoffice formats
+                'doc' => 'application/msword',
+                'pot|pps|ppt|ppam|pptm|sldm|ppsm|potm' => 'application/vnd.ms-powerpoint',
+                'wri' => 'application/vnd.ms-write',
+                'xla|xls|xlt|xlw' => 'application/vnd.ms-excel',
+                'mdb' => 'application/vnd.ms-access',
+                'mpp' => 'application/vnd.ms-project',
+                'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                'docm' => 'application/vnd.ms-word.document.macroEnabled.12',
+                'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+                'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
+                'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
+                'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+                'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12',
+                'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+                'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+                'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+                'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+                'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+                'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
+                'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+                'potm' => 'application/vnd.ms-powerpoint.template.macroEnabled.12',
+                'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+                'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+                'sldm' => 'application/vnd.ms-powerpoint.slide.macroEnabled.12',
+                'onetoc|onetoc2|onetmp|onepkg' => 'application/onenote',
                 // openoffice formats
                 'odt' => 'application/vnd.oasis.opendocument.text',
                 'odp' => 'application/vnd.oasis.opendocument.presentation',