diff options
| -rw-r--r-- | Zend/zend_language_scanner.l | 1 | ||||
| -rw-r--r-- | ext/tokenizer/tokenizer.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 3d98eb1f2e..093e9253d8 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1005,6 +1005,7 @@ int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ if (zend_prepare_string_for_scanning(str, str_name TSRMLS_CC)==FAILURE) { return FAILURE; } + BEGIN(INITIAL); zend_highlight(syntax_highlighter_ini TSRMLS_CC); zend_restore_lexical_state(&original_lex_state TSRMLS_CC); zval_dtor(str); diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index 55cbfed97f..4d2f78893c 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -521,6 +521,8 @@ PHP_FUNCTION(token_get_all) RETURN_EMPTY_STRING(); } + LANG_SCNG(start) = 1; + tokenize(return_value TSRMLS_CC); zend_restore_lexical_state(&original_lex_state TSRMLS_CC); |