From 82874e094b87a2cc8b6ba4da4e320da0291e4f16 Mon Sep 17 00:00:00 2001
From: Brian Shire <shire@php.net>
Date: Mon, 14 Jan 2008 22:09:52 +0000
Subject: MFH: Fix bug #42850 array_walk_recursive() leaves references, refix
 bug #34982

---
 ext/standard/array.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext/standard/array.c')

diff --git a/ext/standard/array.c b/ext/standard/array.c
index b2983090e0..c7f2c3a30a 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1038,7 +1038,7 @@ static int php_array_walk(HashTable *target_hash, zval **userdata, int recursive
 			zend_fcall_info orig_array_walk_fci;
 			zend_fcall_info_cache orig_array_walk_fci_cache;
 
-			SEPARATE_ZVAL_TO_MAKE_IS_REF(args[0]);
+			SEPARATE_ZVAL_IF_NOT_REF(args[0]);
 			thash = HASH_OF(*(args[0]));
 			if (thash->nApplyCount > 1) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "recursion detected");
-- 
cgit v1.2.1