Changeset 34047

Timestamp:

09/11/2015 06:03:22 PM (10 years ago)

Author:

wonderboymusic

Message:

Revert [34009], broke uploads.

See #24934.

File:

• trunk/src/wp-includes/js/plupload/wp-plupload.js (modified) (2 diffs)

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

@@ -263 +263 @@
             }
 
-            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 ) {
@@ -285 +282 @@
                 Uploader.queue.reset();
 
-            self.success( file.attachment, response.data );
+            self.success( file.attachment );
         });