]> granicus.if.org Git - php/commitdiff
Fixed backtrace class<->method order
authorBob Weinand <bobwei9@hotmail.com>
Sun, 24 Nov 2013 21:30:48 +0000 (22:30 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Sun, 24 Nov 2013 21:30:48 +0000 (22:30 +0100)
phpdbg_prompt.c

index ac95e69977418e6188856a11896ed3badfb4b7cb..3de27f786adbdb6ff162177786ec6f6f9c9789f7 100644 (file)
@@ -662,14 +662,17 @@ PHPDBG_COMMAND(back) /* {{{ */
                                } else {
                                        zend_get_object_classname(*class, (const char **)&Z_STRVAL_PP(class), (zend_uint *)&Z_STRLEN_PP(class) TSRMLS_CC);
                                }
-                               if (is_class) {
+                               if (is_class == SUCCESS) {
                                        zend_hash_find(Z_ARRVAL_PP(tmp), "type", sizeof("type"), (void **)&type);
                                }
 
                                phpdbg_write(
                                        "frame #%d: %s%s%s(",
-                                       i++, Z_STRVAL_PP(funcname),
-                                       is_class == FAILURE?"":Z_STRVAL_PP(type), is_class == FAILURE?"":Z_STRVAL_PP(class));
+                                       i++,
+                                       is_class == FAILURE?"":Z_STRVAL_PP(class),
+                                       is_class == FAILURE?"":Z_STRVAL_PP(type),
+                                       Z_STRVAL_PP(funcname)
+                               );
 
                                if (zend_hash_find(Z_ARRVAL_PP(tmp), "args", sizeof("args"), (void **)&args) == SUCCESS) {
                                        HashPosition iterator;