Changeset 31042

Timestamp:

01/04/2015 02:31:29 AM (10 years ago)

Author:

wonderboymusic

Message:

Improve the handling of comma-separated mime-types in wp_match_mime_types(), particularly as pertains to the mime-type selector on the Media list table screen.

Props mdgl.
Fixes #30788.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-media-list-table.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-media-list-table.php

@@ -76 +76 @@
                 $selected = ' selected="selected"';
             if ( !empty( $num_posts[$mime_type] ) )
-                $type_links[$mime_type] = '<option value="post_mime_type:' . sanitize_mime_type( $mime_type ) . '"' . $selected . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</option>';
+                $type_links[$mime_type] = '<option value="post_mime_type:' . esc_attr( $mime_type ) . '"' . $selected . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</option>';
         }
         $type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . sprintf( _nx( 'Unattached (%s)', 'Unattached (%s)', $total_orphans, 'detached files' ), number_format_i18n( $total_orphans ) ) . '</option>';

trunk/src/wp-includes/post.php

@@ -2479 +2479 @@
 
     foreach ( (array) $wildcard_mime_types as $type ) {
-        $regex = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $type ) ) );
-        $patternses[1][$type] = "^$regex$";
-        if ( false === strpos($type, '/') ) {
-            $patternses[2][$type] = "^$regex/";
-            $patternses[3][$type] = $regex;
+        $mimes = array_map( 'trim', explode( ',', $type ) );
+        foreach ( $mimes as $mime ) {
+            $regex = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $mime ) ) );
+            $patternses[][$type] = "^$regex$";
+            if ( false === strpos( $mime, '/' ) ) {
+                $patternses[][$type] = "^$regex/";
+                $patternses[][$type] = $regex;
+            }
         }
     }