Changeset 28416

Timestamp:

05/15/2014 04:28:24 AM (12 years ago)

Author:

wonderboymusic

Message:

Eliminate one of the uses of extract() in wp_handle_sideload().

See #22400.

File:

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

trunk/src/wp-admin/includes/file.php

@@ -422 +422 @@
         if ( $test_type ) {
                 $wp_filetype = wp_check_filetype_and_ext( $file['tmp_name'], $file['name'], $mimes );
-
-                extract( $wp_filetype );
+                $ext = empty( $wp_filetype['ext'] ) ? '' : $wp_filetype['ext'];
+                $type = empty( $wp_filetype['type'] ) ? '' : $wp_filetype['type'];
+                $proper_filename = empty( $wp_filetype['proper_filename'] ) ? '' : $wp_filetype['proper_filename'];
 
                 // Check to see if wp_check_filetype_and_ext() determined the filename was incorrect
-                if ( $proper_filename )
+                if ( $proper_filename ) {
                         $file['name'] = $proper_filename;
-
-                if ( ( !$type || !$ext ) && !current_user_can( 'unfiltered_upload' ) )
-                        return $upload_error_handler( $file, __( 'Sorry, this file type is not permitted for security reasons.' ));
-
-                if ( !$type )
+                }
+                if ( ( ! $type || ! $ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
+                        return $upload_error_handler( $file, __( 'Sorry, this file type is not permitted for security reasons.' ) );
+                }
+                if ( ! $type ) {
                         $type = $file['type'];
+                }
         }