From: Rasmus Lerdorf <rasmus@php.net>
Date: Thu, 19 May 2011 16:26:29 +0000 (+0000)
Subject: Decouple <?= from the short_tags setting and make it always enabled
X-Git-Tag: php-5.5.0alpha1~2066
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9a7f53636569c612770891f483f0e88ea647b48;p=php

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

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;
 }