sniper Wed Oct 8 07:16:23 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard array.c
Log:
- Reverted the 'fix' for bug #25494
# Can we now get peace on internals@ about this stupid issue?
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.430 php-src/NEWS:1.1247.2.431
--- php-src/NEWS:1.1247.2.430 Wed Oct 8 06:25:38 2003
+++ php-src/NEWS Wed Oct 8 07:16:21 2003
@@ -43,7 +43,6 @@
(Sara, patch by: mikael dot suvi at trigger dot ee)
- Fixed bug #25504 (pcre_match_all() crashes when passed only 2 parameters).
(Jani)
-- Fixed bug #25494 (array_merge*() allows non-arrays as argument). (Jay)
- Fixed bug #23488 (zlib.output_compression overrides Vary header). (Stefan)
- Fixed bug #25483 (ext/informix: bogus -469 error from ifx_query()).
(Jani, patch by: denisov at kubsu dot ru)
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.199.2.29 php-src/ext/standard/array.c:1.199.2.30
--- php-src/ext/standard/array.c:1.199.2.29 Sun Oct 5 15:37:06 2003
+++ php-src/ext/standard/array.c Wed Oct 8 07:16:22 2003
@@ -22,7 +22,7 @@
*/
-/* $Id: array.c,v 1.199.2.29 2003/10/05 19:37:06 iliaa Exp $ */
+/* $Id: array.c,v 1.199.2.30 2003/10/08 11:16:22 sniper Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2054,9 +2054,6 @@
array_init(return_value);
for (i=0; i<argc; i++) {
- if (Z_TYPE_PP(args[i]) != IS_ARRAY) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Argument #%d is
not an array", i+1);
- }
SEPARATE_ZVAL(args[i]);
convert_to_array_ex(args[i]);
php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(args[i]),
recursive TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
