]> granicus.if.org Git - php/commitdiff
Decouple <?= from the short_tags setting and make it always enabled
authorRasmus Lerdorf <rasmus@php.net>
Thu, 19 May 2011 16:26:29 +0000 (16:26 +0000)
committerRasmus Lerdorf <rasmus@php.net>
Thu, 19 May 2011 16:26:29 +0000 (16:26 +0000)
Zend/zend_language_scanner.l

index 1e7f92d285a460030941d7c48ae9fdbe9b20ae3a..d504e11071eac8870125f56bbdf76646f0a5f621 100644 (file)
@@ -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;
 }