com php-src: move decl to correct place: Zend/zend_builtin_ functions.c
| From: | Joe Watkins | Date: | Mon, 23 Jan 2017 05:33:58 +0000 |
| Subject: | com php-src: move decl to correct place: Zend/zend_builtin_ functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96845@lists.php.net to get a copy of this message | ||
Commit: d636467937fcfbd708f2b06c9e060bcbe9a63679
Author: Joe Watkins <krakjoe@php.net> Mon, 23 Jan 2017 05:33:58 +0000
Parents: 6f912f7c045ae723d01a24504bf0ae0711fd8a4f
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d636467937fcfbd708f2b06c9e060bcbe9a63679
Log:
move decl to correct place
Changed paths:
M Zend/zend_builtin_functions.c
Diff:
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions..c
index 8f77eb4..547d3f0 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -2364,8 +2364,9 @@ ZEND_FUNCTION(debug_print_backtrace)
object = Z_OBJ(call->This);
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 {