summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--ext/standard/math.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 8a9198f880..68e2086f8d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2005, PHP 5.1
+- Fixed bug #33917 (number_format() output with > 1 char separators). (Jani)
- Fixed bug #33882 (CLI was looking for php.ini in wrong path). (Hartmut)
- Fixed bug #33869 (strtotime() problem with "+1days" format). (Ilia)
- Fixed bug #33841 (pdo sqlite driver forgets to update affected column count
diff --git a/ext/standard/math.c b/ext/standard/math.c
index fdfbeb6d81..2758f8c6e2 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -1099,7 +1099,7 @@ PHP_FUNCTION(number_format)
if (Z_TYPE_PP(d_p) != IS_NULL) {
convert_to_string_ex(d_p);
- if (Z_STRLEN_PP(d_p)==1) {
+ if (Z_STRLEN_PP(d_p)>=1) {
dec_point=Z_STRVAL_PP(d_p)[0];
} else if (Z_STRLEN_PP(d_p)==0) {
dec_point=0;
@@ -1107,7 +1107,7 @@ PHP_FUNCTION(number_format)
}
if (Z_TYPE_PP(t_s) != IS_NULL) {
convert_to_string_ex(t_s);
- if (Z_STRLEN_PP(t_s)==1) {
+ if (Z_STRLEN_PP(t_s)>=1) {
thousand_sep=Z_STRVAL_PP(t_s)[0];
} else if(Z_STRLEN_PP(t_s)==0) {
thousand_sep=0;