From 095093e39090cfff30008f365c382fdd924282db Mon Sep 17 00:00:00 2001
From: Daryl Koopersmith <dkoopersmith@gmail.com>
Date: Wed, 21 Nov 2012 20:17:25 +0000
Subject: [PATCH] Uploader: Route plupload errors to the correct handler and
 prevent naming conflicts. see #21390.

git-svn-id: http://core.svn.wordpress.org/trunk@22789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/js/plupload/wp-plupload.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/js/plupload/wp-plupload.js b/wp-includes/js/plupload/wp-plupload.js
index 23afd0ecd3..2c826085d5 100644
--- a/wp-includes/js/plupload/wp-plupload.js
+++ b/wp-includes/js/plupload/wp-plupload.js
@@ -211,19 +211,19 @@ window.wp = window.wp || {};
 			self.success( file.attachment );
 		});
 
-		this.uploader.bind( 'Error', function( up, error ) {
+		this.uploader.bind( 'Error', function( up, pluploadError ) {
 			var message = pluploadL10n.default_error,
 				key;
 
 			// Check for plupload errors.
 			for ( key in Uploader.errorMap ) {
-				if ( error.code === plupload[ key ] ) {
+				if ( pluploadError.code === plupload[ key ] ) {
 					message = Uploader.errorMap[ key ];
 					break;
 				}
 			}
 
-			self.error( message, error, error.file );
+			error( message, pluploadError, pluploadError.file );
 			up.refresh();
 		});