diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-23 05:34:21 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-23 05:34:21 +0000 |
| commit | 5589df128cd7f98c48f5d2c1c154eb927f84f53c (patch) | |
| tree | 23d273d65476ad944980646fabbb831543185d67 | |
| parent | 8bda5420648021dd6f92bac45915d6422b636df3 (diff) | |
| parent | d636467937fcfbd708f2b06c9e060bcbe9a63679 (diff) | |
| download | php-git-5589df128cd7f98c48f5d2c1c154eb927f84f53c.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move decl to correct place
| -rw-r--r-- | Zend/zend_builtin_functions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index d6941da778..8d0a41ca73 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -2446,8 +2446,9 @@ ZEND_FUNCTION(debug_print_backtrace) object = (Z_TYPE(call->This) == IS_OBJECT) ? Z_OBJ(call->This) : NULL; if (call->func) { - func = call->func; zend_string *zend_function_name; + + func = call->func; if (func->common.scope && func->common.scope->trait_aliases) { zend_function_name = zend_resolve_method_name(object ? object->ce : func->common.scope, func); } else { |