From b34fcd4791c47a0dbb97522d7f88f734e93f70d4 Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Mon, 1 Oct 2007 12:05:41 +0000 Subject: MFH: Fixed bug #42789 --- ext/standard/string.c | 4 +-- ext/standard/tests/strings/implode1.phpt | Bin 5830 -> 5852 bytes ext/standard/tests/strings/join_error.phpt | 4 +-- ext/standard/tests/strings/join_variation2.phpt | 46 ++++++++++++------------ 4 files changed, 27 insertions(+), 27 deletions(-) (limited to 'ext') diff --git a/ext/standard/string.c b/ext/standard/string.c index e94773c427..2ef6df6cba 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -988,7 +988,7 @@ 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"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument must be an array"); return; } @@ -1008,7 +1008,7 @@ PHP_FUNCTION(implode) convert_to_string_ex(arg1); delim = *arg1; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad arguments"); + 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 0c64e1df2d..3a4dabbe8c 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 a759e1e86a..aa6bdc2306 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--