summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2016-11-30 02:57:16 +0100
committerBob Weinand <bobwei9@hotmail.com>2016-11-30 02:57:16 +0100
commit7aaa1a876e82484c0c491c48efeda69dcc79507d (patch)
tree17f93a9b9b99e931508851be83566dcff131ebca /sapi/phpdbg/phpdbg.c
parentcabcf8971f849ed72562916f7c113608568650c6 (diff)
parentb73a3afff333143b2908b280e6a4e26d61cb3138 (diff)
downloadphp-git-7aaa1a876e82484c0c491c48efeda69dcc79507d.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
-rw-r--r--sapi/phpdbg/phpdbg.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index b47c7c82b3..dc7422fcae 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -1893,9 +1893,7 @@ phpdbg_main:
/* initialize from file */
PHPDBG_G(flags) |= PHPDBG_IS_INITIALIZING;
zend_try {
- if (init_file) {
- phpdbg_init(init_file, init_file_len, init_file_default);
- }
+ phpdbg_init(init_file, init_file_len, init_file_default);
} zend_end_try();
PHPDBG_G(flags) &= ~PHPDBG_IS_INITIALIZING;