jani Mon Oct 1 12:05:41 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard string.c
/php-src/ext/standard/tests/strings implode1.phpt join_error.phpt
join_variation2.phpt
Log:
MFH: Fixed bug #42789
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.1&r2=1.445.2.14.2.69.2.2&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.1
php-src/ext/standard/string.c:1.445.2.14.2.69.2.2
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.1 Sun Sep 30 05:40:23 2007
+++ php-src/ext/standard/string.c Mon Oct 1 12:05:41 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.69.2.1 2007/09/30 05:40:23 jani Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.2 2007/10/01 12:05:41 jani Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -988,7 +988,7 @@
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 @@
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;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/implode1.phpt?r1=1.1.2.4.2.1&r2=1.1.2.4.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/implode1.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/join_error.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/strings/join_error.phpt
diff -u php-src/ext/standard/tests/strings/join_error.phpt:1.1.4.3
php-src/ext/standard/tests/strings/join_error.phpt:1.1.4.4
--- php-src/ext/standard/tests/strings/join_error.phpt:1.1.4.3 Sun Sep 30
14:37:33 2007
+++ php-src/ext/standard/tests/strings/join_error.phpt Mon Oct 1 12:05:41 2007
@@ -1,5 +1,5 @@
--TEST--
-Test join() function : error conditions(Bug#42789)
+Test join() function: error conditions
--FILE--
<?php
/* Prototype : string join( string $glue, array $pieces )
@@ -45,6 +45,6 @@
-- Testing join() with less than expected no. of arguments --
-Warning: join(): Argument to implode must be an array in %s on line %d
+Warning: join(): Argument must be an array in %s on line %d
NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/join_variation2.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/strings/join_variation2.phpt
diff -u php-src/ext/standard/tests/strings/join_variation2.phpt:1.1.4.2
php-src/ext/standard/tests/strings/join_variation2.phpt:1.1.4.3
--- php-src/ext/standard/tests/strings/join_variation2.phpt:1.1.4.2 Sat Sep
29 16:52:54 2007
+++ php-src/ext/standard/tests/strings/join_variation2.phpt Mon Oct 1
12:05:41 2007
@@ -105,94 +105,94 @@
--- Testing join() by supplying different values for 'pieces' argument ---
-- Iteration 1 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 2 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 3 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 4 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 5 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 6 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 7 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 8 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 9 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 10 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 11 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 12 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 13 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 14 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 15 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 16 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 17 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 18 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 19 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 20 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 21 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 22 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
-- Iteration 23 --
-Warning: join(): Bad arguments in %s on line %d
+Warning: join(): Invalid arguments passed in %s on line %d
NULL
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
