Ticket #24934: 24934.diff

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

@@ -204 +204 @@
 
                         if ( ! _.isObject( response ) || _.isUndefined( response.success ) )
                                 return error( pluploadL10n.default_error, null, file );
-                        else if ( ! response.success )
-                                return error( response.data && response.data.message, response.data, file );
+                        else if ( ! response.success && ! _.isObject( response.data ) )
+                                return error( response.data, null, file );
+                        else
+                                return error( response.data.message || pluploadL10n.default_error, response.data, file );
 
                         _.each(['file','loaded','size','percent'], function( key ) {
                                 file.attachment.unset( key );
@@ -221 +223 @@
                         if ( complete )
                                 Uploader.queue.reset();
 
-                        self.success( file.attachment );
+                        self.success( file.attachment, response.data );
                 });
 
                 this.uploader.bind( 'Error', function( up, pluploadError ) {