Index: branches/5.2.x/core/kernel/utility/formatters/formatter.php
===================================================================
diff -u -N -r13840 -r14095
--- branches/5.2.x/core/kernel/utility/formatters/formatter.php	(.../formatter.php)	(revision 13840)
+++ branches/5.2.x/core/kernel/utility/formatters/formatter.php	(.../formatter.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: formatter.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: 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
@@ -21,9 +21,14 @@
 	 */
 	var $_categoryHelper = null;
 
-	function kFormatter()
+	/**
+	 * Creates formatter instance
+	 *
+	 * @access public
+	 */
+	public function __construct()
 	{
-		parent::kBase();
+		parent::__construct();
 
 		$this->_categoryHelper =& $this->Application->recallObject('CategoryHelper');
 	}
@@ -68,7 +73,7 @@
 			if ($field_type == 'string') {
 				if (!$this->Application->isAdmin && isset($options['allow_html']) && $options['allow_html']) {
 					// this allows to revert htmlspecialchars call for each field submitted on front-end
-					$value = unhtmlentities($value);
+					$value = kUtil::unhtmlentities($value);
 				}
 				return $value;
 			}
@@ -105,7 +110,8 @@
 		foreach ($src as $id => $row) {
 			$tmp_row = array();
 			foreach ($row as $fld => $value) {
-				$tmp_row[$fld] = $this->TypeCast($value, $object->Fields[$fld]);
+				$field_options = $object->GetFieldOptions($fld);
+				$tmp_row[$fld] = $this->TypeCast($value, $field_options);
 			}
 			$dst[$id] = $tmp_row;
 		}