diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-04-21 01:26:48 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-04-21 01:26:48 +0200 |
| commit | 36202ef0569db9039c683cf8b2245ca54cd6da46 (patch) | |
| tree | 0030fbceb9fccf28c776a90faa03ec477d0f3e35 /Zend/zend_compile.c | |
| parent | dc3ab58c14cb58e33b8a0c5c7a181846eb8b4ff3 (diff) | |
| parent | 672a99597cce8b3ff133a8fddd44c1a9fc0158e5 (diff) | |
| download | php-git-36202ef0569db9039c683cf8b2245ca54cd6da46.tar.gz | |
Merge remote-tracking branch 'origin/PHP-7.0'
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 11eb04040b..842fa64563 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7314,7 +7314,7 @@ zend_bool zend_is_allowed_in_const_expr(zend_ast_kind kind) /* {{{ */ || kind == ZEND_AST_CONDITIONAL || kind == ZEND_AST_DIM || kind == ZEND_AST_ARRAY || kind == ZEND_AST_ARRAY_ELEM || kind == ZEND_AST_CONST || kind == ZEND_AST_CLASS_CONST - || kind == ZEND_AST_MAGIC_CONST; + || kind == ZEND_AST_MAGIC_CONST || kind == ZEND_AST_COALESCE; } /* }}} */ |