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

Timestamp:

05/22/2014 09:35:36 PM (12 years ago)

Author:

wonderboymusic

Message:

Fix parsing in wp_match_mime_types() to allow some mime-types with + in them to appear in the list of filter links shown above the list table on upload.php.

Props _duck.
Fixes #20672.

File:

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

trunk/src/wp-includes/post.php

@@ -2330 +2330 @@
  * @return array array(wildcard=>array(real types))
  */
-function wp_match_mime_types($wildcard_mime_types, $real_mime_types) {
+function wp_match_mime_types( $wildcard_mime_types, $real_mime_types ) {
         $matches = array();
-        if ( is_string($wildcard_mime_types) )
-                $wildcard_mime_types = array_map('trim', explode(',', $wildcard_mime_types));
-        if ( is_string($real_mime_types) )
-                $real_mime_types = array_map('trim', explode(',', $real_mime_types));
+        if ( is_string( $wildcard_mime_types ) ) {
+                $wildcard_mime_types = array_map( 'trim', explode( ',', $wildcard_mime_types ) );
+        }
+        if ( is_string( $real_mime_types ) ) {
+                $real_mime_types = array_map( 'trim', explode( ',', $real_mime_types ) );
+        }
+
+        $patternses = array();
         $wild = '[-._a-z0-9]*';
+
         foreach ( (array) $wildcard_mime_types as $type ) {
-                $type = str_replace('*', $wild, $type);
-                $patternses[1][$type] = "^$type$";
+                $regex = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $type ) ) );
+                $patternses[1][$type] = "^$regex$";
                 if ( false === strpos($type, '/') ) {
-                        $patternses[2][$type] = "^$type/";
-                        $patternses[3][$type] = $type;
-                }
-        }
-        asort($patternses);
-        foreach ( $patternses as $patterns )
-                foreach ( $patterns as $type => $pattern )
-                        foreach ( (array) $real_mime_types as $real )
-                                if ( preg_match("#$pattern#", $real) && ( empty($matches[$type]) || false === array_search($real, $matches[$type]) ) )
+                        $patternses[2][$type] = "^$regex/";
+                        $patternses[3][$type] = $regex;
+                }
+        }
+        asort( $patternses );
+
+        foreach ( $patternses as $patterns ) {
+                foreach ( $patterns as $type => $pattern ) {
+                        foreach ( (array) $real_mime_types as $real ) {
+                                if ( preg_match( "#$pattern#", $real ) && ( empty( $matches[$type] ) || false === array_search( $real, $matches[$type] ) ) ) {
                                         $matches[$type][] = $real;
+                                }
+                        }
+                }
+        }
         return $matches;
 }