WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Scott Taylor 2014-05-15 04:29:15 +00:00
parent c0b0b00e6d
commit fc59804352
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-admin/includes/file.php
View File

@ -421,19 +421,21 @@ 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. // A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
if ( $test_type ) { if ( $test_type ) {
$wp_filetype = wp_check_filetype_and_ext( $file['tmp_name'], $file['name'], $mimes ); $wp_filetype = wp_check_filetype_and_ext( $file['tmp_name'], $file['name'], $mimes );
$ext = empty( $wp_filetype['ext'] ) ? '' : $wp_filetype['ext'];
extract( $wp_filetype ); $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 // Check to see if wp_check_filetype_and_ext() determined the filename was incorrect
if ( $proper_filename ) if ( $proper_filename ) {
$file['name'] = $proper_filename; $file['name'] = $proper_filename;
}
if ( ( !$type || !$ext ) && !current_user_can( 'unfiltered_upload' ) ) if ( ( ! $type || ! $ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
return $upload_error_handler( $file, __( 'Sorry, this file type is not permitted for security reasons.' )); return $upload_error_handler( $file, __( 'Sorry, this file type is not permitted for security reasons.' ) );
}
if ( !$type ) if ( ! $type ) {
$type = $file['type']; $type = $file['type'];
} }
}
// A writable uploads dir will pass this test. Again, there's no point overriding this one. // A writable uploads dir will pass this test. Again, there's no point overriding this one.
if ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) ) if ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) )