com php-src: Fixed backtrace class<->method order: phpdbg_pro mpt.c

From: Date: Sun, 24 Nov 2013 21:30:48 +0000
Subject: com php-src: Fixed backtrace class<->method order: phpdbg_pro mpt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74605@lists.php.net to get a copy of this message
Commit: ce05e41c14c5a05187035a3b94af9c14723880d3 Author: Bob Weinand <bobwei9@hotmail.com> Sun, 24 Nov 2013 22:30:48 +0100 Parents: c41ef19c3b5365cab87fa0d9d871fc5328316fd5 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ce05e41c14c5a05187035a3b94af9c14723880d3 Log: Fixed backtrace class<->method order Changed paths: M phpdbg_prompt.c Diff: diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index ac95e69..3de27f7 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;

« previous php.cvs (#74605) next »