Forgot to merge this part

diff --git a/ext/standard/array.c b/ext/standard/array.c
index ec544911f16383d0851dafe45a463851eec90c91..a1c0df8c0da40734196ec7d88d15369168e62fa0 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -969,9 +969,7 @@ static int php_array_walk(HashTable *target_hash, zval **userdata TSRMLS_DC)
                        Z_TYPE_P(key) = IS_LONG;
                        Z_LVAL_P(key) = num_key;
                } else {
-                       Z_TYPE_P(key) = IS_STRING;
-                       Z_STRVAL_P(key) = string_key;
-                       Z_STRLEN_P(key) = string_key_len-1;
+                       ZVAL_STRINGL(key, string_key, string_key_len-1, 1);
                }
                
                /* Call the userland function */