]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 23 Jan 2017 05:34:21 +0000 (05:34 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 23 Jan 2017 05:34:21 +0000 (05:34 +0000)
* PHP-7.0:
  move decl to correct place

1  2 
Zend/zend_builtin_functions.c

index d6941da778a6b90e0bc5894cff7498d53af589a0,547d3f0b8faec05e8462a9ac54c742c255daef57..8d0a41ca73b5addda837e51da67bf05c14ccf2a1
@@@ -2443,11 -2361,12 +2443,12 @@@ ZEND_FUNCTION(debug_print_backtrace
                }
  
                /* $this may be passed into regular internal functions */
 -              object = Z_OBJ(call->This);
 +              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 {