Browse Source
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move decl to correct place
pull/2357/head
Joe Watkins
10 years ago
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
1 changed files with
2 additions and
1 deletions
-
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 { |
|
|
|
|
