From: Jani Taskinen Date: Mon, 1 Oct 2007 12:04:09 +0000 (+0000) Subject: - Fixed bug #42789 (join() warning messages are not proper & different X-Git-Tag: RELEASE_2_0_0a1~1699 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d762757ee5ace9d3491d8edf21bc4f310ecbbd7e;p=php - 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. --- 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; } } diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt index 48ba05a063..faabc98917 100644 Binary files a/ext/standard/tests/strings/implode1.phpt and b/ext/standard/tests/strings/implode1.phpt differ diff --git a/ext/standard/tests/strings/join_error.phpt b/ext/standard/tests/strings/join_error.phpt index 60c2de61f5..943b36ac21 100644 --- a/ext/standard/tests/strings/join_error.phpt +++ b/ext/standard/tests/strings/join_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test join() function : error conditions(Bug#42789) +Test join() function: error conditions --FILE--