diff options
| author | Timm Friebe <thekid@thekid.de> | 2014-07-06 17:07:01 +0200 |
|---|---|---|
| committer | Timm Friebe <thekid@thekid.de> | 2014-07-06 17:07:01 +0200 |
| commit | a1554ca6343598c38e4fb4fbcc46419ce0bdf058 (patch) | |
| tree | e66e73ff23a340cf7343459a0331a57b8eff65aa /sapi/phpdbg/phpdbg_frame.c | |
| parent | e0d51d1cf00d43c57104764b620bb9219889a86d (diff) | |
| parent | 5b925824edf3edc951fc41608d5cbd07a0baab08 (diff) | |
| download | php-git-a1554ca6343598c38e4fb4fbcc46419ce0bdf058.tar.gz | |
Merge in changes from master
Now also includes "on [TYPE]" in "Call to a member function" error
Diffstat (limited to 'sapi/phpdbg/phpdbg_frame.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_frame.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c index de02addc1b..a235fe8cb0 100644 --- a/sapi/phpdbg/phpdbg_frame.c +++ b/sapi/phpdbg/phpdbg_frame.c @@ -167,7 +167,7 @@ void phpdbg_dump_backtrace(size_t num TSRMLS_DC) /* {{{ */ zval **tmp; zval **file, **line; HashPosition position; - int i = 1, limit = num; + int i = 0, limit = num; int user_defined; if (limit < 0) { @@ -186,7 +186,7 @@ void phpdbg_dump_backtrace(size_t num TSRMLS_DC) /* {{{ */ if (zend_hash_get_current_data_ex(Z_ARRVAL(zbacktrace), (void**)&tmp, &position) == FAILURE) { - phpdbg_write("frame #0: {main} at %s:%ld", Z_STRVAL_PP(file), Z_LVAL_PP(line)); + phpdbg_write("frame #%d: {main} at %s:%ld", i, Z_STRVAL_PP(file), Z_LVAL_PP(line)); break; } |