Fix array_keys() on $GLOBALS

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 7b49b2fd131d672ea4e74b594a41750b389fcfe2..7d8e4d0efe515b81a36f523c91e1f00a4a37a7bb 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2597,7 +2597,7 @@ PHP_FUNCTION(array_keys)
        add_key = 1;
 
        /* Go through input array and add keys to the return array */
-       ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(input), num_idx, str_idx, entry) {
+       ZEND_HASH_FOREACH_KEY_VAL_IND(Z_ARRVAL_P(input), num_idx, str_idx, entry) {
                if (search_value != NULL) {
                        is_equal_func(&res, search_value, entry TSRMLS_CC);
                        add_key = zval_is_true(&res);

diff --git a/ext/standard/tests/array/array_keys_on_GLOBALS.phpt b/ext/standard/tests/array/array_keys_on_GLOBALS.phpt
new file mode 100644 (file)
index 0000000..1d14ff4
--- /dev/null
+++ b/ext/standard/tests/array/array_keys_on_GLOBALS.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Using array_keys() on $GLOBALS
+--FILE--
+<?php
+
+$foo = 'bar';
+unset($foo);
+var_dump(in_array('foo', array_keys($GLOBALS)));
+
+?>
+--EXPECT--
+bool(false)