Index: branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/formatter.php
===================================================================
diff -u -r6508 -r6514
--- branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/formatter.php	(.../formatter.php)	(revision 6508)
+++ branches/unlabeled/unlabeled-1.1.2/core/kernel/utility/formatters/formatter.php	(.../formatter.php)	(revision 6514)
@@ -61,17 +61,8 @@
 		}
 
 		if (preg_match('#int|integer|double|float|real|numeric#', $options['type'])) {
-			static $comma = null;
-			static $thousands = null;
-			if (is_null($comma) || is_null($thousands)) {
-				$lang =& $this->Application->recallObject('lang.current');
-				$comma = $lang->GetDBField('DecimalPoint');
-				$thousands = $lang->GetDBField('ThousandSep');
-			}
-
-			//counting decimal places after formatting with sprintf (if any), otherwise - 0
-			$dec_places = preg_match('/[\.,]+/', $tc_value) ? strlen(preg_replace('/^.*[\.,]+/', '', $tc_value)) : 0;
-			return number_format($tc_value, $dec_places, $comma, $thousands);
+			$lang =& $this->Application->recallObject('lang.current');
+			return $lang->formatNumber($tc_value);
 		}
 
 		return $tc_value;