Changeset 21541 for trunk/wp-includes/functions.php

Timestamp:

08/17/2012 05:25:19 PM (12 years ago)

Author:

ryan

Message:

Introduce wp_get_mime_types() for fetching the complete list of mime types. Remove the static caching of the types so that filters other than the first filter work. Use wp_get_mime_types() in do_enclose(). fixes #21299 #21594

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -459 +459 @@
                     $extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );
                     if ( !empty( $extension ) ) {
-                        foreach ( get_allowed_mime_types( ) as $exts => $mime ) {
+                        foreach ( wp_get_mime_types() as $exts => $mime ) {
                             if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
                                 $type = $mime;
@@ -1755 +1755 @@
 
 /**
+ * Retrieve list of mime types and file extensions.
+ *
+ * @since 3.5.0
+ *
+ * @uses apply_filters() Calls 'mime_types' on returned array. This filter should
+ * be used to add types, not remove them. To remove types use the upload_mimes filter.
+ *
+ * @return array Array of mime types keyed by the file extension regex corresponding to those types.
+ */
+function wp_get_mime_types() {
+    // Accepted MIME types are set here as PCRE unless provided.
+    return apply_filters( 'mime_types', 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',
+    'ics' => 'text/calendar',
+    'rtx' => 'text/richtext',
+    'css' => 'text/css',
+    'htm|html' => 'text/html',
+    // Audio formats
+    'mp3|m4a|m4b' => 'audio/mpeg',
+    'ra|ram' => 'audio/x-realaudio',
+    'wav' => 'audio/wav',
+    'ogg|oga' => 'audio/ogg',
+    'mid|midi' => 'audio/midi',
+    'wma' => 'audio/wma',
+    'mka' => 'audio/x-matroska',
+    // Misc application formats 
+    'rtf' => 'application/rtf',
+    'js' => 'application/javascript',
+    'pdf' => 'application/pdf',
+    'swf' => 'application/x-shockwave-flash',
+    'class' => 'application/java',
+    'tar' => 'application/x-tar',
+    'zip' => 'application/zip',
+    'gz|gzip' => 'application/x-gzip',
+    'rar' => 'application/rar',
+    '7z' => 'application/x-7z-compressed',
+    'exe' => 'application/x-msdownload',
+    // MS Office formats
+    'doc' => 'application/msword',
+    'pot|pps|ppt' => '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',
+    'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+    'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+    'xltm' => 'application/vnd.ms-excel.template.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',
+    'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+    'odg' => 'application/vnd.oasis.opendocument.graphics',
+    'odc' => 'application/vnd.oasis.opendocument.chart',
+    'odb' => 'application/vnd.oasis.opendocument.database',
+    'odf' => 'application/vnd.oasis.opendocument.formula',
+    // WordPerfect formats
+    'wp|wpd' => 'application/wordperfect',
+    ) );
+}
+/**
  * Retrieve list of allowed mime types and file extensions.
  *
@@ -1760 +1857 @@
  *
  * @uses apply_filters() Calls 'upload_mimes' on returned array
+ * @uses wp_get_upload_mime_types() to fetch the list of mime types
+ * 
  * @return array Array of mime types keyed by the file extension regex corresponding to those types.
  */
 function get_allowed_mime_types() {
-    static $mimes = false;
-
-    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',
-        'ics' => 'text/calendar',
-        'rtx' => 'text/richtext',
-        'css' => 'text/css',
-        'htm|html' => 'text/html',
-        // Audio formats
-        'mp3|m4a|m4b' => 'audio/mpeg',
-        'ra|ram' => 'audio/x-realaudio',
-        'wav' => 'audio/wav',
-        'ogg|oga' => 'audio/ogg',
-        'mid|midi' => 'audio/midi',
-        'wma' => 'audio/wma',
-        'mka' => 'audio/x-matroska',
-        // Misc application formats 
-        'rtf' => 'application/rtf',
-        'js' => 'application/javascript',
-        'pdf' => 'application/pdf',
-        'swf' => 'application/x-shockwave-flash',
-        'class' => 'application/java',
-        'tar' => 'application/x-tar',
-        'zip' => 'application/zip',
-        'gz|gzip' => 'application/x-gzip',
-        'rar' => 'application/rar',
-        '7z' => 'application/x-7z-compressed',
-        'exe' => 'application/x-msdownload',
-        // MS Office formats
-        'doc' => 'application/msword',
-        'pot|pps|ppt' => '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',
-        'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-        'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-        'xltm' => 'application/vnd.ms-excel.template.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',
-        'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-        'odg' => 'application/vnd.oasis.opendocument.graphics',
-        'odc' => 'application/vnd.oasis.opendocument.chart',
-        'odb' => 'application/vnd.oasis.opendocument.database',
-        'odf' => 'application/vnd.oasis.opendocument.formula',
-        // WordPerfect formats
-        'wp|wpd' => 'application/wordperfect',
-        ) );
-    }
-
-    return $mimes;
+    return apply_filters( 'upload_mimes', wp_get_mime_types() );
 }