makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 20:08:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/twig] Support our old INCLUDE statements (no quotes)

Browse source 
Better code for handling IF .blah

PHPBB3-11598
This commit is contained in:
Nathan Guse 2013-06-09 23:32:39 -05:00
parent 1da4be04b0
commit 87cc8af265
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
phpBB/includes/template/twig/lexer.php
View file

@ -19,24 +19,34 @@ class phpbb_template_twig_lexer extends Twig_Lexer
{ {
protected function lexExpression() protected function lexExpression()
{ {
parent::lexExpression();
// Last element parsed
$last_element = end($this->tokens);
/**
* Check for old fashioned INCLUDE statements without enclosed quotes
*/
if ($last_element->getValue() === 'INCLUDE')
{
if (preg_match('#^\s*([a-zA-Z0-9_]+\.[a-zA-Z0-9]+)#', substr($this->code, $this->cursor), $match))
{
$this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
$this->moveCursor($match[0]);
}
}
/** /**
* This is some compatibility code to continue supporting expressions such as: * This is some compatibility code to continue supporting expressions such as:
* <!-- IF .blah --> * <!-- IF .blah -->
*
* This does not seem very efficient, but I have not been able to find a better
* method which works properly (maybe lexData can do it better, @todo test this)
*/ */
$last_element = end($this->tokens); if ($last_element->getValue() === 'IF')
if ($last_element->getValue() === '.')
{ {
$last_element2 = prev($this->tokens); if (preg_match('#^\s*\.([a-zA-Z0-9\.]+)#', substr($this->code, $this->cursor), $match))
if ($last_element2->getValue() === 'IF')
{ {
array_pop($this->tokens); $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[1]));
$this->moveCursor($match[0]);
} }
} }
parent::lexExpression();
} }
} }