diff options
| author | Jani Taskinen <jani@php.net> | 2007-10-01 12:04:09 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-10-01 12:04:09 +0000 |
| commit | d762757ee5ace9d3491d8edf21bc4f310ecbbd7e (patch) | |
| tree | 10ba1efbd488f7274af4c5a64af25e51c49e395a /ext/standard/string.c | |
| parent | 50b34c809960af18a14a79c79ae709454c248140 (diff) | |
| download | php-git-d762757ee5ace9d3491d8edf21bc4f310ecbbd7e.tar.gz | |
- Fixed bug #42789 (join() warning messages are not proper & different
return value on php5/6)
# For consistency between 5/6 also made the return value be NULL like it
# has been for ages when invalid stuff is passed.
Diffstat (limited to 'ext/standard/string.c')
| -rw-r--r-- | ext/standard/string.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index bf59f11386..604596ee81 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1265,8 +1265,8 @@ PHP_FUNCTION(implode) if (argc == 1) { if (Z_TYPE_PP(arg1) != IS_ARRAY) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument to implode must be an array"); - RETURN_FALSE; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument must be an array"); + return; } else { SEPARATE_ZVAL(arg1); arr = *arg1; @@ -1293,8 +1293,8 @@ PHP_FUNCTION(implode) } delim = *arg1; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad arguments"); - RETURN_FALSE; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments passed"); + return; } } |