Index: branches/unlabeled/unlabeled-1.2.2/core/kernel/utility/formatters/unit_formatter.php
===================================================================
diff -u -r7698 -r8254
--- branches/unlabeled/unlabeled-1.2.2/core/kernel/utility/formatters/unit_formatter.php	(.../unit_formatter.php)	(revision 7698)
+++ branches/unlabeled/unlabeled-1.2.2/core/kernel/utility/formatters/unit_formatter.php	(.../unit_formatter.php)	(revision 8254)
@@ -29,6 +29,7 @@
 	{
 		if( !isset($options['master_field']) )
 		{
+			if ($value == -1) return; // for infinity setting, otherwise infinity is incorrectly converted back to Kg
 			$regional =& $this->Application->recallObject('lang.current');
 			switch( $regional->GetDBField('UnitSystem') )
 			{