diff options
| author | Reeze Xia <reeze@php.net> | 2015-03-03 18:38:28 +0800 |
|---|---|---|
| committer | Reeze Xia <reeze@php.net> | 2015-03-03 18:38:28 +0800 |
| commit | bc28ed6788459829593c5ddff310a505651cb797 (patch) | |
| tree | 7a3fac7bcb90c1766e63af7feff84eeedc292dd2 /Zend/zend_API.c | |
| parent | f97251adecfcf5ff7880136dfc594171457235f1 (diff) | |
| parent | aa63449b6e1b7c3cf82ae7a65be01580525643af (diff) | |
| download | php-git-bc28ed6788459829593c5ddff310a505651cb797.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Remove wrong commit committed by accident
Fixed bug #69167 (call_user_func does not support references anymore)
Fixed #69166 (Assigning array_values() to array does not reset key counter)
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 693a8340f8..3a6dbe5058 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3017,6 +3017,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint return 0; } +again: switch (Z_TYPE_P(callable)) { case IS_STRING: if (object) { @@ -3160,7 +3161,6 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint } } return 0; - case IS_OBJECT: if (Z_OBJ_HANDLER_P(callable, get_closure) && Z_OBJ_HANDLER_P(callable, get_closure)(callable, &fcc->calling_scope, &fcc->function_handler, &fcc->object) == SUCCESS) { fcc->called_scope = fcc->calling_scope; @@ -3173,8 +3173,14 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint } return 1; } - /* break missing intentionally */ - + if (callable_name) { + *callable_name = zval_get_string(callable); + } + if (error) zend_spprintf(error, 0, "no array or string given"); + return 0; + case IS_REFERENCE: + callable = Z_REFVAL_P(callable); + goto again; default: if (callable_name) { *callable_name = zval_get_string(callable); |