- Reverted the 'fix' for bug #25494

# Can we now get peace on internals@ about this stupid issue?

diff --git a/NEWS b/NEWS
index 4cfb1b5410dfb06dd78afbc5f26f823cce3eddb0..7031abcb662e50d40c98a1ab3e908c494b17a1e2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -43,7 +43,6 @@ PHP 4                                                                      NEWS
   (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)

diff --git a/ext/standard/array.c b/ext/standard/array.c
index d78943f65b381486791eea9f04b8552539cda0b1..7052c35778f3be9e66dd9e85331c9ae74dca8591 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2054,9 +2054,6 @@ static void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMETERS, int recursive)
        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);