Index: uploader.js
===================================================================
--- uploader.js	(revision 14318)
+++ uploader.js	(working copy)
@@ -143,30 +143,30 @@
 
 	this.swf = new SWFObject(this.params.baseUrl + '/swfupload.swf', this.flash_id, this.params.buttonWidth, this.params.buttonHeight, '9', '#FFFFFF');
 	this.swf.setAttribute('style', '');
-	this.swf.addParam('wmode', escape(this.params.wmode));
+	this.swf.addParam('wmode', encodeURIComponent(this.params.wmode));
 
-	this.swf.addVariable('movieName', escape(this.flash_id));
+	this.swf.addVariable('movieName', encodeURIComponent(this.flash_id));
 	this.swf.addVariable('fileUploadLimit', 0);
-	this.swf.addVariable('fileQueueLimit', escape(this.params.fileQueueLimit));
-	this.swf.addVariable('fileSizeLimit',  escape(this.params.allowedFilesize)); // in kilobytes
-	this.swf.addVariable('fileTypes',  escape(this.params.allowedFiletypes));
-	this.swf.addVariable('fileTypesDescription',  escape(this.params.allowedFiletypesDescription));
-	this.swf.addVariable('uploadURL',  escape(this.params.uploadURL));
+	this.swf.addVariable('fileQueueLimit', encodeURIComponent(this.params.fileQueueLimit));
+	this.swf.addVariable('fileSizeLimit',  encodeURIComponent(this.params.allowedFilesize)); // in kilobytes
+	this.swf.addVariable('fileTypes',  encodeURIComponent(this.params.allowedFiletypes));
+	this.swf.addVariable('fileTypesDescription',  encodeURIComponent(this.params.allowedFiletypesDescription));
+	this.swf.addVariable('uploadURL',  encodeURIComponent(this.params.uploadURL));
 
 	// upload button appearance
-	this.swf.addVariable('buttonImageURL', escape(this.params.buttonImageURL));
-	this.swf.addVariable('buttonWidth', escape(this.params.buttonWidth));
-	this.swf.addVariable('buttonHeight', escape(this.params.buttonHeight));
-	this.swf.addVariable('buttonText', escape(this.params.buttonText));
-	this.swf.addVariable('buttonTextTopPadding', escape(this.params.buttonTextTopPadding));
-	this.swf.addVariable('buttonTextLeftPadding', escape(this.params.buttonTextLeftPadding));
-	this.swf.addVariable('buttonTextStyle', escape(this.params.buttonTextStyle));
-	this.swf.addVariable('buttonAction', escape(this.params.buttonAction));
-	this.swf.addVariable('buttonDisabled', escape(this.params.buttonDisabled));
-	this.swf.addVariable('buttonCursor', escape(this.params.buttonCursor));
+	this.swf.addVariable('buttonImageURL', encodeURIComponent(this.params.buttonImageURL));
+	this.swf.addVariable('buttonWidth', encodeURIComponent(this.params.buttonWidth));
+	this.swf.addVariable('buttonHeight', encodeURIComponent(this.params.buttonHeight));
+	this.swf.addVariable('buttonText', encodeURIComponent(this.params.buttonText));
+	this.swf.addVariable('buttonTextTopPadding', encodeURIComponent(this.params.buttonTextTopPadding));
+	this.swf.addVariable('buttonTextLeftPadding', encodeURIComponent(this.params.buttonTextLeftPadding));
+	this.swf.addVariable('buttonTextStyle', encodeURIComponent(this.params.buttonTextStyle));
+	this.swf.addVariable('buttonAction', encodeURIComponent(this.params.buttonAction));
+	this.swf.addVariable('buttonDisabled', encodeURIComponent(this.params.buttonDisabled));
+	this.swf.addVariable('buttonCursor', encodeURIComponent(this.params.buttonCursor));
 
 	if (UploadsManager._debugMode) {
-		this.swf.addVariable('debugEnabled', escape('true')); // flash var
+		this.swf.addVariable('debugEnabled', encodeURIComponent('true')); // flash var
 	}
 
 	var $me = this;