Index: branches/5.1.x/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -N -r13569 -r13667
--- branches/5.1.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 13569)
+++ branches/5.1.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 13667)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upload_formatter.php 13569 2010-05-18 15:25:01Z alex $
+* @version	$Id: upload_formatter.php 13667 2010-06-01 09:15:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -266,14 +266,15 @@
 		switch ($format) {
 			case 'full_url':
 				if (isset($options['direct_links']) && $options['direct_links']) {
-					return rtrim($this->Application->BaseURL(), '/') . str_replace(DIRECTORY_SEPARATOR, '/', $upload_dir) . $value;
+					return $this->fileHelper->pathToUrl(FULL_PATH . $upload_dir . $value);
 				}
 				else {
 					$url_params = Array (
 						'no_amp' => 1, 'pass' => 'm,'.$object->Prefix,
-						$object->Prefix.'_event' => 'OnViewFile',
-						'file' => $value, 'field' => $field_name
+						$object->Prefix . '_event' => 'OnViewFile',
+						'file' => rawurlencode($value), 'field' => $field_name
 					);
+
 					return $this->Application->HREF('', '', $url_params);
 				}
 				break;