diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-07-20 21:57:00 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-07-20 21:57:00 +0200 |
| commit | f0b50963e5e526e81bd488d94152c81a6033dfaa (patch) | |
| tree | d8a934b2d090a98ffd222f9d7303d1244f2eab40 /sapi/phpdbg/phpdbg.c | |
| parent | 6aadeba213305a0b8818c347bea956cb7e258c3a (diff) | |
| download | php-git-f0b50963e5e526e81bd488d94152c81a6033dfaa.tar.gz | |
Do not use readline when not having a tty
This is important for e.g. run-tests.php
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 3fdc7cbe30..d594601f29 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -564,7 +564,7 @@ static PHP_FUNCTION(phpdbg_end_oplog) last_function = op_array->function_name; last_scope = op_array->scope; if (last_scope == NULL) { - fn_name = zend_string_copy(last_function ? last_function : last_file); + fn_name = zend_string_copy(last_function); } else { fn_name = strpprintf(ZSTR_LEN(last_function) + ZSTR_LEN(last_scope->name) + 2, "%.*s::%.*s", ZSTR_LEN(last_scope->name), ZSTR_VAL(last_scope->name), ZSTR_LEN(last_function), ZSTR_VAL(last_function)); } |