summaryrefslogtreecommitdiff
path: root/ext/standard/array.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-05-28 17:15:22 +0200
committerAnatol Belski <ab@php.net>2018-05-28 17:15:22 +0200
commit74be58938c8839062bbc3803547ec96010e3e411 (patch)
tree1d4518b6b6913814a2e651d3f5874b73a2d1b9f9 /ext/standard/array.c
parentc9df8ac6c5ef7b0fc9e6efc46e759f591fffbba4 (diff)
parentd5ee654b7113c4123a5f2d4628016d31dbced2d4 (diff)
downloadphp-git-74be58938c8839062bbc3803547ec96010e3e411.tar.gz
Merge branch 'PHP-7.2'
* PHP-7.2: Translate correct C++ version with suitable compiler Fixed bug #76383 (array_map on $GLOBALS returns IS_INDIRECT)
Diffstat (limited to 'ext/standard/array.c')
-rw-r--r--ext/standard/array.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 55d338faad..363abfc771 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -6140,7 +6140,7 @@ PHP_FUNCTION(array_map)
array_init_size(return_value, maxlen);
zend_hash_real_init(Z_ARRVAL_P(return_value), HT_FLAGS(Z_ARRVAL(arrays[0])) & HASH_FLAG_PACKED);
- ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL(arrays[0]), num_key, str_key, zv) {
+ ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL(arrays[0]), num_key, str_key, zv) {
fci.retval = &result;
fci.param_count = 1;
fci.params = &arg;