PHP 8 rerun of number_format fix.

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

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 82c8daaf619ee1e46829bc8895c6bfc3be1dd12a..bb7478cd119b348bd8fcd819065b6a9f8d73c7e8 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -313,13 +313,12 @@ function number_format2($number, $decimals=0)
        $tsep = $SysPrefs->thoseps[user_tho_sep()];
        $dsep = $SysPrefs->decseps[user_dec_sep()];
 
-       if ($number == '')
-               $number = 0;
+       $number = (float)$number;
        if($decimals==='max')
                $dec = 15 - floor(log10(abs($number)));
        else {
                $delta = ($number < 0 ? -.0000000001 : .0000000001);
-               @$number += $delta;
+               $number += $delta;
                $dec = $decimals;
        }
 
@@ -366,18 +365,10 @@ function price_decimal_format($number, &$dec)
        }
        return number_format2($number, $dec);
 }
-// function money_format doesn't exist in OS Win.
-if (!function_exists('money_format'))
-{
-       function money_format($format, $number) 
-       {
-               return price_format($number);
-       } 
-}      
 
 // 2008-06-15. Added extra parameter $stock_id and reference for $dec
 //--------------------------------------------------------------------
-function qty_format($number, $stock_id=null, &$dec) {
+function qty_format($number, $stock_id, &$dec) {
        $dec = get_qty_dec($stock_id);
     return number_format2($number, $dec);
 }