mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 13:35:13 +02:00
Code Issues Releases Wiki Activity

[ticket/11943] Require stricter DEFINE statements for templates

Browse Source 
PHPBB3-11943
This commit is contained in:
Nathan Guse
2013-11-08 19:55:16 -06:00
parent b49d3a1851
commit da332aa0a5
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ class lexer extends \Twig_Lexer
// Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}') // Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}')
$code = $this->fix_inline_variable_tokens(array( $code = $this->fix_inline_variable_tokens(array(
'DEFINE \$[a-zA-Z0-9_]+ =', //'DEFINE \$[a-zA-Z0-9_]+ =', // Disabling for ticket 11943
'INCLUDE', 'INCLUDE',
'INCLUDEPHP', 'INCLUDEPHP',
'INCLUDEJS', 'INCLUDEJS',
@ -129,14 +129,6 @@ class lexer extends \Twig_Lexer
// Replace template variables with start/end to parse variables (' ~ TEST ~ '.html) // Replace template variables with start/end to parse variables (' ~ TEST ~ '.html)
$matches[2] = preg_replace('#{([a-zA-Z0-9_\.$]+)}#', "'~ \$1 ~'", $matches[2]); $matches[2] = preg_replace('#{([a-zA-Z0-9_\.$]+)}#', "'~ \$1 ~'", $matches[2]);
// If the second item is exactly one of a few key words,
// do not quote it as it changes the meaning
// http://tracker.phpbb.com/browse/PHPBB3-11943
if (in_array($matches[2], array('false', 'true', 'null')))
{
return "<!-- {$matches[1]} {$matches[2]} -->";
}
// Surround the matches in single quotes ('' ~ TEST ~ '.html') // Surround the matches in single quotes ('' ~ TEST ~ '.html')
return "<!-- {$matches[1]} '{$matches[2]}' -->"; return "<!-- {$matches[1]} '{$matches[2]}' -->";
}; };