Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r15434 -r15446
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15434)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 15446)
@@ -350,10 +350,7 @@
 			<div id="<inp2:{$prefix}_InputName field='$field'/>_queueinfo" class="uploader-queue"></div>
 
 			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[upload]" id="<inp2:{$prefix}_InputName field='$field'/>[upload]" value="<inp2:{$prefix}_Field field='$field' format='file_names'/>">
-			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[order]" id="<inp2:{$prefix}_InputName field='$field'/>[order]" value="<inp2:{$prefix}_Field field='$field' format='file_names'/>">
-			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[tmp_ids]" id="<inp2:{$prefix}_InputName field='$field'/>[tmp_ids]" value="">
-			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[tmp_names]" id="<inp2:{$prefix}_InputName field='$field'/>[tmp_names]" value="">
-			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[tmp_deleted]" id="<inp2:{$prefix}_InputName field='$field'/>[tmp_deleted]" value="">
+			<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[json]" id="<inp2:{$prefix}_InputName field='$field'/>[json]" value="">
 
 			<script type="text/javascript">
 				UploadsManager.AddUploader('<inp2:{$prefix}_InputName field="$field"/>',
@@ -366,13 +363,11 @@
 						prefix : '<inp2:m_Param name="prefix"/>',
 						field : '<inp2:m_Param name="field"/>',
 						thumb_format: '<inp2:{$prefix}_FieldOption field="$field" option="thumb_format"/>',
-						urls : '<inp2:{$prefix}_Field field="$field" format="file_urls" no_special="1" js_escape="1"/>',
-						names : '<inp2:{$prefix}_Field field="$field" format="file_names" no_special="1" js_escape="1"/>',
-						sizes : '<inp2:{$prefix}_Field field="$field" format="file_sizes" no_special="1" js_escape="1"/>',
+						json : '<inp2:{$prefix}_Field field="$field" format="files_json" no_special="1" js_escape="1"/>',
 						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="#FIELD#" 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" />',
+						deleteURL : '<inp2:m_t pass="all,$prefix" {$prefix}_event="OnDeleteFile" tmp="#TMP#" field="#FIELD#" file="#FILE#" id="#ID#" js_escape="1" no_amp="1"/>',
+						previewURL : '<inp2:m_t pass="all,$prefix" {$prefix}_event="OnViewFile" tmp="#TMP#" field="#FIELD#" file="#FILE#" id="#ID#" js_escape="1" no_amp="1" />',
 
 						// Button settings
 						buttonImageURL: 'img/upload.png',	// Relative to the Flash file