diff options
| author | Remi Collet <remi@php.net> | 2012-11-28 10:31:49 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2012-11-28 10:31:49 +0100 |
| commit | 0f4772d12ff0fb95e2d8d2dc54b9b49d4ba8db96 (patch) | |
| tree | 4c9bca05c300fb575acefd84d7c094282cba1474 /ext/reflection/php_reflection.c | |
| parent | 7751a6882485de64365661f4e7918535c3992982 (diff) | |
| parent | be1e5b9c54629d1502afd0ca61700426192edfb1 (diff) | |
| download | php-git-0f4772d12ff0fb95e2d8d2dc54b9b49d4ba8db96.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
BFN #61272
fix bug #61272 ob_start callback get passed empty string
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
This test isn't supposed to pass on windows
Fixed Bug #63614 (Fatal error on Reflection)
Diffstat (limited to 'ext/reflection/php_reflection.c')
| -rw-r--r-- | ext/reflection/php_reflection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 53b2389d63..60f1e547a6 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -1884,7 +1884,7 @@ ZEND_METHOD(reflection_function, getStaticVariables) /* Return an empty array in case no static variables exist */ array_init(return_value); if (fptr->type == ZEND_USER_FUNCTION && fptr->op_array.static_variables != NULL) { - zend_hash_apply_with_argument(fptr->op_array.static_variables, (apply_func_arg_t) zval_update_constant, (void*)1 TSRMLS_CC); + zend_hash_apply_with_argument(fptr->op_array.static_variables, (apply_func_arg_t) zval_update_constant_inline_change, fptr->common.scope TSRMLS_CC); zend_hash_copy(Z_ARRVAL_P(return_value), fptr->op_array.static_variables, (copy_ctor_func_t) zval_add_ref, (void *) &tmp_copy, sizeof(zval *)); } } |