From 79656b5fddd10c6421e5836db162b0f07836c92e Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 17 Sep 2015 04:46:00 +0000 Subject: [PATCH] Uploader: Fire 'wp_handle_upload' in `wp_upload_bits()`. Thusly, the filter in `wp_xmlrpc_server::mw_newMediaObject()` is redundant. Props dllh. Fixes #33539. git-svn-id: https://develop.svn.wordpress.org/trunk@34257 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-xmlrpc-server.php | 5 ++--- src/wp-includes/functions.php | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/class-wp-xmlrpc-server.php b/src/wp-includes/class-wp-xmlrpc-server.php index 78288bd278..78581cbfab 100644 --- a/src/wp-includes/class-wp-xmlrpc-server.php +++ b/src/wp-includes/class-wp-xmlrpc-server.php @@ -5737,11 +5737,10 @@ class wp_xmlrpc_server extends IXR_Server { 'id' => strval( $id ), 'file' => $name, 'url' => $upload[ 'url' ], - 'type' => $type + 'type' => $upload[ 'type' ] ); - /** This filter is documented in wp-admin/includes/file.php */ - return apply_filters( 'wp_handle_upload', $struct, 'upload' ); + return $struct; } /* MovableType API functions diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index 2da3569ff1..bad987c9f1 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -1993,7 +1993,8 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) { // Compute the URL $url = $upload['url'] . "/$filename"; - return array( 'file' => $new_file, 'url' => $url, 'error' => false ); + /** This filter is documented in wp-admin/includes/file.php */ + return apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $wp_filetype['type'], 'error' => false ), 'sideload' ); } /**