diff options
author | krakjoe <joe.watkins@live.co.uk> | 2013-11-24 21:34:38 +0000 |
---|---|---|
committer | krakjoe <joe.watkins@live.co.uk> | 2013-11-24 21:34:38 +0000 |
commit | fbfb216966cf9e60ecbcf6d4b8a071ca87d10812 (patch) | |
tree | dc59206957241a825c89c78aad7e46dd4fce4b9f | |
parent | 99f32e845e5facb5f94a8620677e833dc845990d (diff) | |
parent | ce05e41c14c5a05187035a3b94af9c14723880d3 (diff) | |
download | php-git-fbfb216966cf9e60ecbcf6d4b8a071ca87d10812.tar.gz |
Merge branch 'master' of https://github.com/krakjoe/phpdbg
-rw-r--r-- | phpdbg_prompt.c | 9 |
1 files changed, 6 insertions, 3 deletions
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; |