mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 20:45:16 +02:00
Code Issues Releases Wiki Activity

[ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF

Browse Source 
PHPBB3-11718
This commit is contained in:
Nathaniel Guse
2013-07-19 13:08:41 -05:00
parent 29322e85ff
commit b92f660ed3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/phpbb/template/twig/lexer.php
View File

@ -219,19 +219,20 @@ class phpbb_template_twig_lexer extends Twig_Lexer
{ {
$callback = function($matches) $callback = function($matches)
{ {
$inner = $matches[2];
// Replace $TEST with definition.TEST // Replace $TEST with definition.TEST
$matches[1] = preg_replace('#\s\$([a-zA-Z_0-9]+)#', ' definition.$1', $matches[1]); $inner = preg_replace('#\s\$([a-zA-Z_0-9]+)#', ' definition.$1', $inner);
// Replace .test with test|length // Replace .test with test|length
$matches[1] = preg_replace('#\s\.([a-zA-Z_0-9\.]+)#', ' $1|length', $matches[1]); $inner = preg_replace('#\s\.([a-zA-Z_0-9\.]+)#', ' $1|length', $inner);
return '<!-- IF' . $matches[1] . '-->'; return "<!-- {$matches[1]}IF{$inner}-->";
}; };
// Replace our "div by" with Twig's divisibleby (Twig does not like test names with spaces) // Replace our "div by" with Twig's divisibleby (Twig does not like test names with spaces)
$code = preg_replace('# div by ([0-9]+)#', ' divisibleby($1)', $code); $code = preg_replace('# div by ([0-9]+)#', ' divisibleby($1)', $code);
return preg_replace_callback('#<!-- IF((.*)[\s][\$|\.|!]([^\s]+)(.*))-->#', $callback, $code); return preg_replace_callback('#<!-- (ELSE)?IF((.*)[\s][\$|\.|!]([^\s]+)(.*))-->#', $callback, $code);
} }
/** /**