Changeset 28426 for trunk/src/wp-includes/functions.php

Timestamp:

05/15/2014 06:21:51 AM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate the use of extract() in wp_check_filetype_and_ext().

See #22400.

File:

• trunk/src/wp-includes/functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -1988 +1988 @@
         // Do basic extension validation and MIME mapping
         $wp_filetype = wp_check_filetype( $filename, $mimes );
-        extract( $wp_filetype );
+        $ext = $wp_filetype['ext'];
+        $type = $wp_filetype['type'];
 
         // We can't do any further validation without a file to work with
-        if ( ! file_exists( $file ) )
+        if ( ! file_exists( $file ) ) {
                 return compact( 'ext', 'type', 'proper_filename' );
+        }
 
         // We're able to validate images using GD
@@ -2024 +2026 @@
                                 $new_filename = implode( '.', $filename_parts );
 
-                                if ( $new_filename != $filename )
+                                if ( $new_filename != $filename ) {
                                         $proper_filename = $new_filename; // Mark that it changed
-
+                                }
                                 // Redefine the extension / MIME
                                 $wp_filetype = wp_check_filetype( $new_filename, $mimes );
-                                extract( $wp_filetype );
+                                $ext = $wp_filetype['ext'];
+                                $type = $wp_filetype['type'];
                         }
                 }