diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-11-30 02:57:34 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-11-30 02:57:34 +0100 |
| commit | 7631c8766e17b5f1ace0fcc2a996515545026faf (patch) | |
| tree | bb9833341df5cfa9ec4a029c29bdc19aaa26e8ac /sapi/phpdbg/phpdbg_prompt.c | |
| parent | 503c32e06edcd5b5e01678b714f83e6fee4cdd5c (diff) | |
| parent | 7aaa1a876e82484c0c491c48efeda69dcc79507d (diff) | |
| download | php-git-7631c8766e17b5f1ace0fcc2a996515545026faf.tar.gz | |
Merge branch 'PHP-7.1'
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index ca86583bc1..aff77890d3 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -345,7 +345,9 @@ void phpdbg_try_file_init(char *init_file, size_t init_file_len, zend_bool free_ void phpdbg_init(char *init_file, size_t init_file_len, zend_bool use_default) /* {{{ */ { - if (!init_file && use_default) { + if (init_file) { + phpdbg_try_file_init(init_file, init_file_len, 1); + } else if (use_default) { char *scan_dir = getenv("PHP_INI_SCAN_DIR"); char *sys_ini; int i; @@ -378,8 +380,6 @@ void phpdbg_init(char *init_file, size_t init_file_len, zend_bool use_default) / } phpdbg_try_file_init(PHPDBG_STRL(PHPDBG_INIT_FILENAME), 0); - } else { - phpdbg_try_file_init(init_file, init_file_len, 1); } } /* }}} */ |