Index: branches/5.1.x/core/admin_templates/js/uploader/uploader.js
===================================================================
diff -u -N -r13659 -r13667
--- branches/5.1.x/core/admin_templates/js/uploader/uploader.js	(.../uploader.js)	(revision 13659)
+++ branches/5.1.x/core/admin_templates/js/uploader/uploader.js	(.../uploader.js)	(revision 13667)
@@ -182,7 +182,7 @@
 
 		for (var i = 0; i < urls.length; i++) {
 			var a_file = {
-				id : names[i],
+				id : 'uploaded_' + crc32(names[i]),
 				name : names[i],
 				url : urls[i],
 				size: sizes[i],
@@ -483,7 +483,7 @@
 		this.files[$file_index].uploaded = 1;
 		this.files[$file_index].progress = 100;
 		this.files[$file_index].temp = 1;
-		this.files[$file_index].url = this.params.tmp_url.replace('#ID#', file.id).replace('#FILE#', file.name).replace('#FIELD#', this.params.field);
+		this.files[$file_index].url = this.params.tmp_url.replace('#ID#', file.id).replace('#FILE#', encodeURIComponent(file.name)).replace('#FIELD#', this.params.field);
 	}
 
 	this.updateInfo($file_index);