summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/standard/string.c2
-rw-r--r--ext/standard/tests/strings/bug47546.phpt24
2 files changed, 1 insertions, 25 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 9925b89add..0311caa2d5 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1042,7 +1042,7 @@ PHP_FUNCTION(explode)
if (limit == 0 || limit == 1) {
add_index_stringl(return_value, 0, Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1);
- } else if (limit < -1 && argc == 3) {
+ } else if (limit < 0 && argc == 3) {
php_explode_negative_limit(*delim, *str, return_value, limit);
} else {
php_explode(*delim, *str, return_value, limit);
diff --git a/ext/standard/tests/strings/bug47546.phpt b/ext/standard/tests/strings/bug47546.phpt
deleted file mode 100644
index f04f9be05a..0000000000
--- a/ext/standard/tests/strings/bug47546.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-Bug #47546 (Default value for limit parameter in explode is 0, not -1)
---FILE--
-<?php
-$str = 'one|two|three|four';
-
-print_r(explode('|', $str));
-print_r(explode('|', $str, -1));
-?>
---EXPECT--
-Array
-(
- [0] => one
- [1] => two
- [2] => three
- [3] => four
-)
-Array
-(
- [0] => one
- [1] => two
- [2] => three
- [3] => four
-)