summaryrefslogtreecommitdiff
path: root/ext/standard/array.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-05-28 17:13:55 +0200
committerAnatol Belski <ab@php.net>2018-05-28 17:13:55 +0200
commitd5ee654b7113c4123a5f2d4628016d31dbced2d4 (patch)
tree36edc329afe53165db26cefdc4ac69496cd6d9a9 /ext/standard/array.c
parent4455899a938167ea8617e71dd5f19e92dcc8ab0c (diff)
parent5bf8032112016c2f60149d05d20c8756a6e2664a (diff)
downloadphp-git-d5ee654b7113c4123a5f2d4628016d31dbced2d4.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: 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 6e68010f90..0a9cfb30cb 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -6080,7 +6080,7 @@ PHP_FUNCTION(array_map)
array_init_size(return_value, maxlen);
- 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;