diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2011-05-19 16:26:29 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2011-05-19 16:26:29 +0000 |
| commit | c24ef71e6339351b085177d727a7c781893fa1d2 (patch) | |
| tree | 7a18dfb42076b5a491709c600d46dfa9f130ad57 | |
| parent | 1e2aa4416cd97db51eb1b82afa1b0416da9c0d08 (diff) | |
| download | php-git-c24ef71e6339351b085177d727a7c781893fa1d2.tar.gz | |
Decouple <?= from the short_tags setting and make it always enabled
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | Zend/zend_language_scanner.l | 14 |
2 files changed, 7 insertions, 10 deletions
@@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 201?, PHP 5.3.99 +?? ??? 201?, PHP 5.4.0 - Upgraded bundled Sqlite3 to version 3.7.4. (Ilia) - Upgraded bundled PCRE to version 8.10. (Ilia) @@ -29,6 +29,7 @@ PHP NEWS - Changed third parameter of preg_match_all() to optional. FR #53238. (Adam) - Changed silent casting of null/''/false into an Object when adding a property into a warning. (Scott) +- <?= is now always available regardless of the short_tags setting (Rasmus) - General improvements: . Added multibyte support by default. Previously php had to be compiled diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 1e7f92d285..d504e11071 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1668,15 +1668,11 @@ NEWLINE ("\r"|"\n"|"\r\n") <INITIAL>"<?=" { - if (CG(short_tags)) { - zendlval->value.str.val = yytext; /* no copying - intentional */ - zendlval->value.str.len = yyleng; - zendlval->type = IS_STRING; - BEGIN(ST_IN_SCRIPTING); - return T_OPEN_TAG_WITH_ECHO; - } else { - goto inline_char_handler; - } + zendlval->value.str.val = yytext; /* no copying - intentional */ + zendlval->value.str.len = yyleng; + zendlval->type = IS_STRING; + BEGIN(ST_IN_SCRIPTING); + return T_OPEN_TAG_WITH_ECHO; } |