From 6a37ad14641e27f8ee05991814ccb3f34096f2fb Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 10 Sep 2015 18:18:41 +0000 Subject: [PATCH] WP Plupload: on `FileUploaded`, allow `success` and `error` callbacks to receive server responses after a successful upload. Props ippetkov. Fixes #24934. git-svn-id: https://develop.svn.wordpress.org/trunk@34009 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/plupload/wp-plupload.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/js/plupload/wp-plupload.js b/src/wp-includes/js/plupload/wp-plupload.js index 09a37ceff2..0a06ba02d0 100644 --- a/src/wp-includes/js/plupload/wp-plupload.js +++ b/src/wp-includes/js/plupload/wp-plupload.js @@ -262,10 +262,13 @@ 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 ) - 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 ); @@ -281,7 +284,7 @@ window.wp = window.wp || {}; if ( complete ) Uploader.queue.reset(); - self.success( file.attachment ); + self.success( file.attachment, response.data ); }); /**