From 523550c2234364c2f0f757a5a3dcddb44a66ca42 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Fri, 11 Sep 2015 18:03:22 +0000 Subject: [PATCH] Revert [34009], broke uploads. See #24934. git-svn-id: https://develop.svn.wordpress.org/trunk@34047 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/plupload/wp-plupload.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/wp-includes/js/plupload/wp-plupload.js b/src/wp-includes/js/plupload/wp-plupload.js index 0a06ba02d0..09a37ceff2 100644 --- a/src/wp-includes/js/plupload/wp-plupload.js +++ b/src/wp-includes/js/plupload/wp-plupload.js @@ -262,13 +262,10 @@ window.wp = window.wp || {}; return error( pluploadL10n.default_error, e, file ); } - if ( ! _.isObject( response ) || _.isUndefined( response.success ) ) { + if ( ! _.isObject( response ) || _.isUndefined( response.success ) ) return error( pluploadL10n.default_error, null, 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 ); - } + else if ( ! response.success ) + return error( response.data && response.data.message, response.data, file ); _.each(['file','loaded','size','percent'], function( key ) { file.attachment.unset( key ); @@ -284,7 +281,7 @@ window.wp = window.wp || {}; if ( complete ) Uploader.queue.reset(); - self.success( file.attachment, response.data ); + self.success( file.attachment ); }); /**