Index: branches/5.2.x/core/kernel/utility/formatters/unit_formatter.php
===================================================================
diff -u -N -r13840 -r14095
--- branches/5.2.x/core/kernel/utility/formatters/unit_formatter.php	(.../unit_formatter.php)	(revision 13840)
+++ branches/5.2.x/core/kernel/utility/formatters/unit_formatter.php	(.../unit_formatter.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_formatter.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: unit_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
@@ -14,6 +14,15 @@
 
 class kUnitFormatter extends kFormatter {
 
+	/**
+	 * The method is supposed to alter config options or cofigure object in some way based on its usage of formatters
+	 * The methods is called for every field with formatter defined when configuring item.
+	 * Could be used for adding additional VirtualFields to an object required by some special Formatter
+	 *
+	 * @param string $field_name
+	 * @param array $field_options
+	 * @param kDBBase $object
+	 */
 	function PrepareOptions($field_name, &$field_options, &$object)
 	{
 		if( !isset($field_options['master_field']) )
@@ -27,16 +36,25 @@
 				case 2: // US/UK
 					$field_options_copy = $field_options;
 					unset($field_options_copy['min_value_exc']);
-					$add_fields[$field_name.'_a'] = array_merge_recursive2($field_options_copy, $options_a);
-					$add_fields[$field_name.'_b'] = array_merge_recursive2($field_options_copy, $options_b);
+					$add_fields[$field_name.'_a'] = kUtil::array_merge_recursive($field_options_copy, $options_a);
+					$add_fields[$field_name.'_b'] = kUtil::array_merge_recursive($field_options_copy, $options_b);
 				break;
 				default:
 			}
-			$add_fields = array_merge_recursive2($add_fields, $object->VirtualFields);
+			$add_fields = kUtil::array_merge_recursive($add_fields, $object->getVirtualFields());
 			$object->setVirtualFields($add_fields);
 		}
 	}
 
+	/**
+	 * Used for split fields like timestamp -> date, time
+	 * Called from DBItem Validate (before validation) to get back master field value from its sub_fields
+	 *
+	 * @param string $field
+	 * @param mixed $value
+	 * @param Array $options
+	 * @param kDBItem $object
+	 */
 	function UpdateMasterFields($field, $value, &$options, &$object)
 	{
 		if( !isset($options['master_field']) )
@@ -54,12 +72,14 @@
 					}
 					elseif($major === null && $minor === null)
 					{
-						unset($object->Fields[$field]);
+						$fields = $object->getFields();
+						unset($fields[$field]);
+						$object->setFields($fields);
 						return;
 					}
 					else
 					{
-						$value = Pounds2Kg($major, $minor);
+						$value = kUtil::Pounds2Kg($major, $minor);
 					}
 				break;
 				default:
@@ -83,7 +103,7 @@
 					}
 					else
 					{
-						list($major,$minor) = Kg2Pounds($value);
+						list($major,$minor) = kUtil::Kg2Pounds($value);
 						/*$major = floor( $value / 0.5 );
 						$minor = ($value - $major * 0.5) * 32;*/
 					}