Changeset 24945

Timestamp:

08/01/2013 01:33:56 PM (12 years ago)

Author:

nacin

Message:

Use wp_get_mime_types() when calling wp_check_filetype() in the audio and video shortcodes. fixes #24911.

Merges [24911] to the 3.6 branch.

Location:

branches/3.6

Files:

• . (modified) (1 prop)
• wp-includes/media.php (modified) (6 diffs)

branches/3.6/wp-includes/media.php

@@ -871 +871 @@
     $primary = false;
     if ( ! empty( $src ) ) {
-        $type = wp_check_filetype( $src );
+        $type = wp_check_filetype( $src, wp_get_mime_types() );
         if ( ! in_array( $type['ext'], $default_types ) )
             return sprintf( '<a class="wp-embedded-audio" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) );
@@ -879 +879 @@
         foreach ( $default_types as $ext ) {
             if ( ! empty( $$ext ) ) {
-                $type = wp_check_filetype( $$ext );
+                $type = wp_check_filetype( $$ext, wp_get_mime_types() );
                 if ( $type['ext'] === $ext )
                     $primary = true;
@@ -935 +935 @@
             if ( empty( $fileurl ) )
                 $fileurl = $$fallback;
-            $type = wp_check_filetype( $$fallback );
+            $type = wp_check_filetype( $$fallback, wp_get_mime_types() );
             $html .= sprintf( $source, $type['type'], esc_url( $$fallback ) );
         }
@@ -1009 +1009 @@
     $primary = false;
     if ( ! empty( $src ) ) {
-        $type = wp_check_filetype( $src );
+        $type = wp_check_filetype( $src, wp_get_mime_types() );
         if ( ! in_array( $type['ext'], $default_types ) )
             return sprintf( '<a class="wp-embedded-video" href="%s">%s</a>', esc_url( $src ), esc_html( $src ) );
@@ -1017 +1017 @@
         foreach ( $default_types as $ext ) {
             if ( ! empty( $$ext ) ) {
-                $type = wp_check_filetype( $$ext );
+                $type = wp_check_filetype( $$ext, wp_get_mime_types() );
                 if ( $type['ext'] === $ext )
                     $primary = true;
@@ -1076 +1076 @@
             if ( empty( $fileurl ) )
                 $fileurl = $$fallback;
-            $type = wp_check_filetype( $$fallback );
+            $type = wp_check_filetype( $$fallback, wp_get_mime_types() );
             // m4v sometimes shows up as video/mpeg which collides with mp4
             if ( 'm4v' === $type['ext'] )