Dead code in wp-admin/includes/file.php:

* In `wp_handle_upload()` and `wp_handle_sideload()`, `$ext` gets conditionally reset... and then is never used.
* In `request_filesystem_credentials()`, `$password` is initialized as an empty string. The variable is never used.

See #27882.


Built from https://develop.svn.wordpress.org/trunk@28268


git-svn-id: http://core.svn.wordpress.org/trunk@28096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-06 04:22:14 +00:00
parent 6295631a4b
commit 644024dfc4

View File

@ -294,9 +294,6 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) {
if ( ( !$type || !$ext ) && !current_user_can( 'unfiltered_upload' ) )
return call_user_func($upload_error_handler, $file, __( 'Sorry, this file type is not permitted for security reasons.' ));
if ( !$ext )
$ext = ltrim(strrchr($file['name'], '.'), '.');
if ( !$type )
$type = $file['type'];
} else {
@ -434,9 +431,6 @@ function wp_handle_sideload( &$file, $overrides = false, $time = null ) {
if ( ( !$type || !$ext ) && !current_user_can( 'unfiltered_upload' ) )
return $upload_error_handler( $file, __( 'Sorry, this file type is not permitted for security reasons.' ));
if ( !$ext )
$ext = ltrim(strrchr($file['name'], '.'), '.');
if ( !$type )
$type = $file['type'];
}
@ -1062,7 +1056,6 @@ function request_filesystem_credentials($form_post, $type = '', $error = false,
}
$hostname = '';
$username = '';
$password = '';
$connection_type = '';
if ( !empty($credentials) )
extract($credentials, EXTR_OVERWRITE);