Index: trunk/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -N -r8178 -r8397
--- trunk/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 8178)
+++ trunk/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 8397)
@@ -168,7 +168,12 @@
 			$names = array();
 			if ($value) { // if value string was not empty
 				foreach ($files as $a_file) {
-					$urls[] = rtrim($this->Application->BaseURL(), '/').$upload_dir.$a_file;
+					if (isset($options['direct_links']) && $options['direct_links']) {
+						$urls[] = rtrim($this->Application->BaseURL(), '/').$upload_dir.$a_file;
+					}
+					else {
+						$urls[] = $this->Application->HREF('', '', array('no_amp'=>1, 'pass'=>'m,'.$object->Prefix, $object->Prefix.'_event'=>'OnViewFile', 'file'=>$a_file, 'field'=>$field_name));
+					}
 					$names[] = $a_file;
 					$sizes[] = filesize(FULL_PATH.$upload_dir.$a_file);
 				}