Ticket #39553: 39553.diff

src/wp-admin/includes/media.php

@@ -1848 +1848 @@
 
 $post_params = array(
         "post_id" => $post_id,
-        "_wpnonce" => wp_create_nonce('media-form'),
+        "_wpnonce" => wp_create_nonce('wp_rest'),
         "type" => $_type,
         "tab" => $_tab,
         "short" => "1",
@@ -1869 +1869 @@
         'browse_button'       => 'plupload-browse-button',
         'container'           => 'plupload-upload-ui',
         'drop_element'        => 'drag-drop-area',
-        'file_data_name'      => 'async-upload',
-        'url'                 => $upload_action_url,
+        'file_data_name'      => 'file',
+        'url'                 => rest_url( '/wp/v2/media' ),
         'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
         'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
         'filters' => array(

src/wp-includes/js/plupload/handlers.js

@@ -482 +482 @@
                 });
 
                 uploader.bind('FileUploaded', function(up, file, response) {
-                        uploadSuccess(file, response.response);
+                        var data = JSON.parse( response.response );
+                        uploadSuccess( file, '' + data.id );
                 });
 
                 uploader.bind('UploadComplete', function() {

src/wp-includes/js/plupload/wp-plupload.js

@@ -259 +259 @@
                  * @return {mixed}
                  */
                 this.uploader.bind( 'FileUploaded', function( up, file, response ) {
-                        var complete;
+                        var complete, attachmentData, status = response.status, mimeType, size, sizeData;
 
                         try {
                                 response = JSON.parse( response.response );
@@ -267 +267 @@
                                 return error( pluploadL10n.default_error, e, file );
                         }
 
-                        if ( ! _.isObject( response ) || _.isUndefined( response.success ) )
+                        if ( ! _.isObject( response ) || _.isUndefined( response.id ) )
                                 return error( pluploadL10n.default_error, null, file );
-                        else if ( ! response.success )
-                                return error( response.data && response.data.message, response.data, file );
+                        else if ( status !== 201 )
+                                return error( response.message, response, file );
 
                         _.each(['file','loaded','size','percent'], function( key ) {
                                 file.attachment.unset( key );
                         });
 
-                        file.attachment.set( _.extend( response.data, { uploading: false }) );
-                        wp.media.model.Attachment.get( response.data.id, file.attachment );
+                        // Convert new-style object to old-style.
+                        mimeType = response.mime_type.indexOf('/') >= 0 ? response.mime_type.split('/') : [ response.mime_type, '' ];
+                        attachmentData = {
+                                id          : response.id,
+                                title       : response.title.raw,
+                                filename    : response.media_details.file.split('/').slice().pop(),
+                                url         : response.source_url,
+                                link        : response.link,
+                                alt         : response.alt_text,
+                                author      : response.author,
+                                authorName  : '', // $author->display_name,
+                                description : response.description.raw,
+                                caption     : response.caption.raw,
+                                name        : response.slug,
+                                status      : response.status,
+                                uploadedTo  : response.parent,
+                                date        : wp.api.utils.parseISO8601( response.date_gmt ),
+                                modified    : wp.api.utils.parseISO8601( response.modified_gmt ),
+                                menuOrder   : 0, //$attachment->menu_order,
+                                mime        : response.mime_type,
+                                type        : mimeType[0],
+                                subtype     : mimeType[1],
+                                icon        : '',//wp_mime_type_icon( $attachment->ID ),
+                                dateFormatted: response.post_date, // mysql2date( __( 'F j, Y' ), $attachment->post_date ),
+                                nonces      : {
+                                        update : this.getOption( 'multipart_params' )._wpnonce, // wp_create_nonce( 'update-post_' . $attachment->ID )
+                                        delete : this.getOption( 'multipart_params' )._wpnonce,
+                                        edit   : this.getOption( 'multipart_params' )._wpnonce, // wp_create_nonce( 'image_editor-' . $attachment->ID )
+                                },
+                                editLink   : false, // get_edit_post_link( $attachment->ID, 'raw' )
+                                meta       : false,
+                        };
+                        if ( response.media_details.sizes ) {
+                                attachmentData.sizes = {};
+                                for (size in response.media_details.sizes) {
+                                        if (response.media_details.sizes.hasOwnProperty(size)) {
+                                                sizeData = response.media_details[ size ];
+                                                attachmentData.sizes[ size ] = {
+                                                        height: sizeData.height,
+                                                        width: sizeData.width,
+                                                        url: sizeData.source_url,
+                                                        orientation: sizeData.height > sizeData.width ? 'portrait' : 'landscape',
+                                                };
+                                        }
+                                }
+                        }
+                        if ( response.media_details.height ) {
+                                attachmentData.height = response.media_details.height;
+                        }
+                        if ( response.media_details.width ) {
+                                attachmentData.width = response.media_details.width;
+                        }
+                        if ( response.media_details.image_meta ) {
+                                attachmentData.meta = response.media_details.image_meta;
+                        }
 
+                        file.attachment.set( _.extend( attachmentData, { uploading: false }) );
+                        wp.media.model.Attachment.get( attachmentData.id, file.attachment );
+
                         complete = Uploader.queue.all( function( attachment ) {
                                 return ! attachment.get('uploading');
                         });

src/wp-includes/media.php

@@ -2983 +2983 @@
 
         $defaults = array(
                 'runtimes'            => 'html5,flash,silverlight,html4',
-                'file_data_name'      => 'async-upload', // key passed to $_FILE.
-                'url'                 => admin_url( 'async-upload.php', 'relative' ),
+                'file_data_name'      => 'file', // key passed to $_FILE.
+                'url'                 => rest_url( '/wp/v2/media' ),
                 'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
                 'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
                 'filters' => array(
@@ -3022 +3022 @@
          * @param array $params Default Plupload parameters array.
          */
         $params = apply_filters( 'plupload_default_params', $params );
-        $params['_wpnonce'] = wp_create_nonce( 'media-form' );
+        $params['_wpnonce'] = wp_create_nonce( 'wp_rest' );
         $defaults['multipart_params'] = $params;
 
         $settings = array(