Merged changes from main CVS up to 2.1.5

[fa-stable.git] / includes / current_user.inc

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 59ed4109e3226e334e84e820ad05daf012d65029..4f216955b8726c0ed6c7ca8b44cf5857e9cc7195 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -155,6 +155,19 @@ function price_format($number) {
        $_SESSION["wa_current_user"]->prefs->price_dec());
 }
 
+function price_decimal_format($number, &$dec)
+{
+       $dec = user_price_dec();
+       $str = strval($number);
+       $pos = strpos($str, '.');
+       if ($pos !== false)
+       {
+               $len = strlen(substr($str, $pos + 1));
+               if ($len > $dec)
+                       $dec = $len;
+       }
+       return number_format2($number, $dec);
+}
 // 2008-06-15. Added extra parameter $stock_id and reference for $dec
 //--------------------------------------------------------------------
 function qty_format($number, $stock_id=null, &$dec) {