From da332aa0a5cbeabbcce5551ee955c701fc2a1d73 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 8 Nov 2013 19:55:16 -0600
Subject: [PATCH] [ticket/11943] Require stricter DEFINE statements for
templates
PHPBB3-11943
---
phpBB/phpbb/template/twig/lexer.php | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index 8c52fa65b2..efd6a0bd84 100644
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -69,7 +69,7 @@ class lexer extends \Twig_Lexer
// Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}')
$code = $this->fix_inline_variable_tokens(array(
- 'DEFINE \$[a-zA-Z0-9_]+ =',
+ //'DEFINE \$[a-zA-Z0-9_]+ =', // Disabling for ticket 11943
'INCLUDE',
'INCLUDEPHP',
'INCLUDEJS',
@@ -129,14 +129,6 @@ class lexer extends \Twig_Lexer
// Replace template variables with start/end to parse variables (' ~ TEST ~ '.html)
$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')
return "<!-- {$matches[1]} '{$matches[2]}' -->";
};