Changes in branches/2.8/wp-includes/functions.php [12172:11678]

File:

• branches/2.8/wp-includes/functions.php (modified) (2 diffs)

branches/2.8/wp-includes/functions.php

@@ -2227 +2227 @@
  */
 function wp_check_filetype( $filename, $mimes = null ) {
-        if ( empty($mimes) )
-                $mimes = get_allowed_mime_types();
-        $type = false;
-        $ext = false;
-
-        foreach ( $mimes as $ext_preg => $mime_match ) {
-                $ext_preg = '!\.(' . $ext_preg . ')$!i';
-                if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
-                        $type = $mime_match;
-                        $ext = $ext_matches[1];
-                        break;
-                }
-        }
-
-        return compact( 'ext', 'type' );
-}
-
-/**
- * Retrieve list of allowed mime types and file extensions.
- *
- * @since 2.8.6
- *
- * @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(
+        // Accepted MIME types are set here as PCRE unless provided.
+        $mimes = ( is_array( $mimes ) ) ? $mimes : apply_filters( 'upload_mimes', array(
                 'jpg|jpeg|jpe' => 'image/jpeg',
                 'gif' => 'image/gif',
@@ -2302 +2274 @@
                 'odb' => 'application/vnd.oasis.opendocument.database',
                 'odf' => 'application/vnd.oasis.opendocument.formula',
-                ) );
-        }
-
-        return $mimes;
+                )
+        );
+
+        $type = false;
+        $ext = false;
+
+        foreach ( $mimes as $ext_preg => $mime_match ) {
+                $ext_preg = '!\.(' . $ext_preg . ')$!i';
+                if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
+                        $type = $mime_match;
+                        $ext = $ext_matches[1];
+                        break;
+                }
+        }
+
+        return compact( 'ext', 'type' );
 }