Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[2.2] Ensure float is safely converted to string

This commit is contained in:
Mike Jolley 2014-12-02 11:20:04 +00:00
parent b852904e37
commit 11af24902b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
includes/wc-formatting-functions.php
View File

@ -183,17 +183,21 @@ function wc_format_refund_total( $amount ) {
* @return string
*/
function wc_format_decimal( $number, $dp = false, $trim_zeros = false ) {
$locale = localeconv();
$decimals = array( get_option( 'woocommerce_price_decimal_sep' ), $locale['decimal_point'], $locale['mon_decimal_point'] );
// Remove locale from string
if ( ! is_float( $number ) ) {
$locale = localeconv();
$decimals = array( get_option( 'woocommerce_price_decimal_sep' ), $locale['decimal_point'], $locale['mon_decimal_point'] );
$number = wc_clean( str_replace( $decimals, '.', $number ) );
$number = wc_clean( str_replace( $decimals, '.', $number ) );
}
// DP is false - don't use number format, just return a string in our format
if ( $dp !== false ) {
$dp = intval( $dp == "" ? get_option( 'woocommerce_price_num_decimals' ) : $dp );
$number = number_format( floatval( $number ), $dp, '.', '' );
// DP is false - don't use number format, just return a string in our format
} elseif ( is_float( $number ) ) {
$number = wc_clean( str_replace( $decimals, '.', strval( $number ) ) );
}
if ( $trim_zeros && strstr( $number, '.' ) ) {