From fc598043522ada65dffa73727a124fc9a21c4165 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 15 May 2014 04:29:15 +0000 Subject: [PATCH] Eliminate one of the uses of `extract()` in `wp_handle_sideload()`. See #22400. Built from https://develop.svn.wordpress.org/trunk@28416 git-svn-id: http://core.svn.wordpress.org/trunk@28243 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/file.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 61b7a0f604..997b5fe20e 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -421,18 +421,20 @@ function wp_handle_sideload( &$file, $overrides = false, $time = null ) { // A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter. 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']; + } } // A writable uploads dir will pass this test. Again, there's no point overriding this one.