projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed php 7.2 count() compatibility and intval cast in number_format2 parameter 2.
[fa-stable.git]
/
includes
/
current_user.inc
diff --git
a/includes/current_user.inc
b/includes/current_user.inc
index 20ce1e0fc9599f8d178f34c07146603497ba18e2..edfae0a92b2b8b6725f0d39f32dc8109cee79d87 100644
(file)
--- a/
includes/current_user.inc
+++ b/
includes/current_user.inc
@@
-315,7
+315,7
@@
function number_format2($number, $decimals=0)
$dec = $decimals;
}
$dec = $decimals;
}
- $num = number_format($number,
$dec
, $dsep, $tsep);
+ $num = number_format($number,
intval($dec)
, $dsep, $tsep);
return $decimals==='max' ? rtrim($num, '0') : $num;
return $decimals==='max' ? rtrim($num, '0') : $num;
@@
-353,7
+353,7
@@
function price_decimal_format($number, &$dec)
if ($pos !== false)
{
$len = strlen(substr($str, $pos + 1));
if ($pos !== false)
{
$len = strlen(substr($str, $pos + 1));
- if ($len > $dec)
+ if ($len > $dec
&& $len < ini_get('precision')-3
)
$dec = $len;
}
return number_format2($number, $dec);
$dec = $len;
}
return number_format2($number, $dec);
@@
-732,6
+732,8
@@
function recalculate_cols(&$cols)
function flush_dir($path, $wipe = false)
{
function flush_dir($path, $wipe = false)
{
+ if (!file_exists($path))
+ return;
$dir = @opendir($path);
if(!$dir)
return;
$dir = @opendir($path);
if(!$dir)
return;