Changeset 31042 for trunk/src/wp-includes/post.php

Timestamp:

01/04/2015 02:31:29 AM (12 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.

File:

• trunk/src/wp-includes/post.php (modified) (1 diff)

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;
+                        }
                 }
         }