Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Decouple <?= from the short_tags setting and make it always enabled

  • Loading branch information...
commit c24ef71e6339351b085177d727a7c781893fa1d2 1 parent 1e2aa44
@rlerdorf rlerdorf authored
Showing with 7 additions and 10 deletions.
  1. +2 −1  NEWS
  2. +5 −9 Zend/zend_language_scanner.l
View
3  NEWS
@@ -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
View
14 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;
}
Please sign in to comment.
Something went wrong with that request. Please try again.