From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 24 Nov 2013 21:30:48 +0000 (+0100)
Subject: Fixed backtrace class<->method order
X-Git-Tag: php-5.6.0alpha1~110^2~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce05e41c14c5a05187035a3b94af9c14723880d3;p=php

Fixed backtrace class<->method order
---

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index ac95e69977..3de27f786a 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -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;