Index: branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -N -r13840 -r14095
--- branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 13840)
+++ branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upload_formatter.php 13667 2010-06-01 09:15:35Z alex $
+* @version	$Id: upload_formatter.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -24,9 +24,9 @@
 	 */
 	var $fileHelper = null;
 
-	function kUploadFormatter()
+	public function __construct()
 	{
-		parent::kFormatter();
+		parent::__construct();
 
 		$this->fileHelper =& $this->Application->recallObject('FileHelper');
 
@@ -229,7 +229,7 @@
 		$tc_value = $this->TypeCast($value, $options);
 		if( ($tc_value === false) || ($tc_value != $value) ) return $value; // for leaving badly formatted date on the form
 
-		$object->Fields[$field_name]['direct_links'] = true; // for case, when non-swf uploader is used
+		$object->SetFieldOption($field_name, 'direct_links', true); // for case, when non-swf uploader is used
 		return $this->GetFormatted($tc_value, $field_name, $object, $format);
 	}
 
@@ -329,12 +329,12 @@
 
 class kPictureFormatter extends kUploadFormatter
 {
-	function kPictureFormatter()
+	public function __construct()
 	{
 		$this->NakeLookupPath = IMAGES_PATH; // used ?
-		$this->DestinationPath = constOn('ADMIN') ? IMAGES_PENDING_PATH : IMAGES_PATH;
+		$this->DestinationPath = kUtil::constOn('ADMIN') ? IMAGES_PENDING_PATH : IMAGES_PATH;
 
-		parent::kUploadFormatter();
+		parent::__construct();
 	}
 
 	function GetFormatted($value, $field_name, &$object, $format = null)