Index: branches/5.2.x/core/admin_templates/js/uploader/uploader.js
===================================================================
diff -u -N -r15733 -r15748
--- branches/5.2.x/core/admin_templates/js/uploader/uploader.js	(.../uploader.js)	(revision 15733)
+++ branches/5.2.x/core/admin_templates/js/uploader/uploader.js	(.../uploader.js)	(revision 15748)
@@ -25,7 +25,7 @@
 	this.files = new Array();
 	this.deleted = new Array();
 
-	this.uploadURL = params.uploadURL;
+	// because used outside this class
 	this.deleteURL = params.deleteURL;
 
 	this.enableUploadButton();
@@ -35,8 +35,10 @@
 Uploader.prototype._ensureDefaultValues = function() {
 	// Upload backend settings
 	var $defaults = {
-		baseUrl: '',
+		baseUrl : '',
 		uploadURL : '',
+		deleteURL : '',
+		previewURL : '',
 		useQueryString : false,
 		requeueOnError : false,
 		httpSuccess : '',
@@ -45,7 +47,7 @@
 		allowedFiletypesDescription : 'All Files',
 		allowedFilesize : 0, // Default zero means "unlimited"
 		multiple : 0,
-		field: '',
+		field : '',
 		thumb_format: '',
 		fileQueueLimit : 0,
 		buttonImageURL : '',
@@ -318,7 +320,7 @@
 		$ret += '<div class="left">';
 
 		if ($need_preview) {
-			$ret += '<a href="' + $file.url + '" target="_new"><img class="thumbnail-image" large_src="' + $file.url + '&thumb=1" src="' + $icon_image + '" alt=""/></a>';
+			$ret += '<a href="' + $file.url + '" target="_new"><img class="thumbnail-image" large_src="' + this.getUrl($file, true) + '" src="' + $icon_image + '" alt=""/></a>';
 		}
 		else {
 			$ret += '<img src="' + $icon_image + '"/>';
@@ -539,7 +541,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#', encodeURIComponent(this.files[$file_index].name)).replace('#FIELD#', this.params.field);
+		this.files[$file_index].url = this.getUrl(this.files[$file_index]);
 		this.updateInfo($file_index);
 	}
 
@@ -554,6 +556,20 @@
 	}
 }
 
+Uploader.prototype.getUrl = function($file, $preview) {
+	var $url = this.params.previewURL.replace('#FILE#', encodeURIComponent($file.name)).replace('#FIELD#', this.params.field);
+
+	if ( $file.temp !== undefined && $file.temp ) {
+		$url += '&tmp=1&id=' + $file.id;
+	}
+
+	if ( $preview !== undefined && $preview === true ) {
+		$url += '&thumb=1';
+	}
+
+	return $url;
+}
+
 Uploader.prototype.getFileIndex = function(file) {
 	for (var f = 0; f < this.files.length; f++) {
 		if (this.files[f].id == file.id) {
Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r15733 -r15748
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15733)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15748)
@@ -372,7 +372,7 @@
 						flashsid : '<inp2:m_SID/>',
 						uploadURL : '<inp2:m_t pass="all,$prefix" {$prefix}_event="OnUploadFile" js_escape="1" no_amp="1" />',
 						deleteURL : '<inp2:m_t pass="all,$prefix" {$prefix}_event="OnDeleteFile" field_id="#FIELD_ID#" file="#FILE#" js_escape="1" no_amp="1"/>',
-						tmp_url : '<inp2:m_t pass="all,$prefix" {$prefix}_event="OnViewFile" tmp="1" field="#FIELD#" file="#FILE#" id="#ID#" js_escape="1" no_amp="1" />',
+						previewURL : '<inp2:m_t pass="all,$prefix" {$prefix}_event="OnViewFile" field="#FIELD#" file="#FILE#" js_escape="1" no_amp="1" />',
 
 						// Button settings
 						buttonImageURL: 'img/upload.png',	// Relative to the Flash file