projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup in gl_db_trans.inc
[fa-stable.git]
/
includes
/
current_user.inc
diff --git
a/includes/current_user.inc
b/includes/current_user.inc
index 62d729b628963c11f352412f549b42faa7f886bd..239324c69dd0f304942fbc8980a88da21eb68afe 100644
(file)
--- a/
includes/current_user.inc
+++ b/
includes/current_user.inc
@@
-302,9
+302,9
@@
function round2($number, $decimals=0)
function number_format2($number, $decimals=0)
{
global $SysPrefs;
function number_format2($number, $decimals=0)
{
global $SysPrefs;
- $tsep = $SysPrefs->thoseps[user_
dec
_sep()];
+ $tsep = $SysPrefs->thoseps[user_
tho
_sep()];
$dsep = $SysPrefs->decseps[user_dec_sep()];
$dsep = $SysPrefs->decseps[user_dec_sep()];
- //return number_format($number, $decimals, $dsep, $tsep);
+
if($decimals==='max')
$dec = 15 - floor(log10(abs($number)));
else {
if($decimals==='max')
$dec = 15 - floor(log10(abs($number)));
else {
@@
-414,12
+414,12
@@
function user_numeric($input) {
$num = str_replace( $sep, '.', $num);
if (!is_numeric($num))
$num = str_replace( $sep, '.', $num);
if (!is_numeric($num))
- return false;
+
return false;
$num = (float)$num;
if ($num == (int)$num)
$num = (float)$num;
if ($num == (int)$num)
- return (int)$num;
+
return (int)$num;
else
else
- return $num;
+
return $num;
}
function user_company()
}
function user_company()