moriyoshi Thu Nov 14 21:16:41 2002 EDT
Modified files:
/php4/ext/standard array.c
Log:
Fixed bug #20381
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.200 php4/ext/standard/array.c:1.201
--- php4/ext/standard/array.c:1.200 Thu Nov 14 00:46:10 2002
+++ php4/ext/standard/array.c Thu Nov 14 21:16:41 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.200 2002/11/14 05:46:10 jon Exp $ */
+/* $Id: array.c,v 1.201 2002/11/15 02:16:41 moriyoshi Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2008,6 +2008,7 @@
get_active_function_name(TSRMLS_C));
return 0;
}
+ SEPARATE_ZVAL(dest_entry);
convert_to_array_ex(dest_entry);
convert_to_array_ex(src_entry);
if (!php_array_merge(Z_ARRVAL_PP(dest_entry),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
