projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from main trunk 2.2.1-2.2.2
[fa-stable.git]
/
includes
/
current_user.inc
diff --git
a/includes/current_user.inc
b/includes/current_user.inc
index e9125bcd755fa1d0cfb0b637509f9c38311d7870..023da535e5d737e72fdad0f1f0631715ccb77b48 100644
(file)
--- a/
includes/current_user.inc
+++ b/
includes/current_user.inc
@@
-239,6
+239,15
@@
function price_decimal_format($number, &$dec)
}
return number_format2($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) {
// 2008-06-15. Added extra parameter $stock_id and reference for $dec
//--------------------------------------------------------------------
function qty_format($number, $stock_id=null, &$dec) {