diff options
author | Nikita Popov <nikic@php.net> | 2014-08-16 22:08:02 +0200 |
---|---|---|
committer | Nikita Popov <nikic@php.net> | 2014-08-16 22:08:02 +0200 |
commit | 38a173916c6bd4f38eee02336e3f7e022dca4f16 (patch) | |
tree | de229de695e003369445985979e0260f9ee128ec /Zend/zend_ast.c | |
parent | 71675a4bf830d7b9400663275fe48275480d34f4 (diff) | |
download | php-git-38a173916c6bd4f38eee02336e3f7e022dca4f16.tar.gz |
Fix merge
Diffstat (limited to 'Zend/zend_ast.c')
-rw-r--r-- | Zend/zend_ast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 8e1d970c41..d6995efe88 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -314,7 +314,7 @@ ZEND_API void zend_ast_evaluate(zval *result, zend_ast *ast, zend_class_entry *s } } break; - case ZEND_FETCH_DIM_R: + case ZEND_AST_DIM: zend_ast_evaluate(&op1, ast->child[0], scope TSRMLS_CC); zend_ast_evaluate(&op2, ast->child[1], scope TSRMLS_CC); { |