WordPress.org

Make WordPress Core

Changeset 22789


Ignore:
Timestamp:
11/21/2012 08:17:25 PM (8 years ago)
Author:
koopersmith
Message:

Uploader: Route plupload errors to the correct handler and prevent naming conflicts. see #21390.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/js/plupload/wp-plupload.js

    r22788 r22789  
    212212        });
    213213
    214         this.uploader.bind( 'Error', function( up, error ) {
     214        this.uploader.bind( 'Error', function( up, pluploadError ) {
    215215            var message = pluploadL10n.default_error,
    216216                key;
     
    218218            // Check for plupload errors.
    219219            for ( key in Uploader.errorMap ) {
    220                 if ( error.code === plupload[ key ] ) {
     220                if ( pluploadError.code === plupload[ key ] ) {
    221221                    message = Uploader.errorMap[ key ];
    222222                    break;
     
    224224            }
    225225
    226             self.error( message, error, error.file );
     226            error( message, pluploadError, pluploadError.file );
    227227            up.refresh();
    228228        });
Note: See TracChangeset for help on using the changeset viewer.