diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-11-11 18:23:37 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-11-11 18:23:37 +0100 |
| commit | cfb0a4103083c4787beca30671d16eede92bd571 (patch) | |
| tree | 5c76bc1b1c9bba12a16c13063eb40523682b2094 /phpBB/phpbb/template/twig/tokenparser/defineparser.php | |
| parent | 4bd078e00fd5994e7fbe0e65b00fa93d082ac383 (diff) | |
| parent | 47e364ae68a92dbf2107c56a2165b219e4312b50 (diff) | |
| download | forums-cfb0a4103083c4787beca30671d16eede92bd571.tar forums-cfb0a4103083c4787beca30671d16eede92bd571.tar.gz forums-cfb0a4103083c4787beca30671d16eede92bd571.tar.bz2 forums-cfb0a4103083c4787beca30671d16eede92bd571.tar.xz forums-cfb0a4103083c4787beca30671d16eede92bd571.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11943' into develop
* EXreaction/ticket/11943:
[ticket/11943] New line at EOF for define_error.html
[ticket/11943] Forgot template file for test
[ticket/11943] Throw an exception if DEFINE is setup improperly
[ticket/11943] Split fix_inline_variable_tokens into 3 steps
[ticket/11943] Require stricter DEFINE statements for templates
[ticket/11943] Do not quote the value when it is exactly true, false, or null
[ticket/11943] Add test for DEFINE $VAR = false
Diffstat (limited to 'phpBB/phpbb/template/twig/tokenparser/defineparser.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/tokenparser/defineparser.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/phpbb/template/twig/tokenparser/defineparser.php b/phpBB/phpbb/template/twig/tokenparser/defineparser.php index 21add0c17c..8484f2e81a 100644 --- a/phpBB/phpbb/template/twig/tokenparser/defineparser.php +++ b/phpBB/phpbb/template/twig/tokenparser/defineparser.php @@ -30,6 +30,13 @@ class defineparser extends \Twig_TokenParser $stream->next(); $value = $this->parser->getExpressionParser()->parseExpression(); + if ($value instanceof \Twig_Node_Expression_Name) + { + // This would happen if someone improperly formed their DEFINE syntax + // e.g. <!-- DEFINE $VAR = foo --> + throw new \Twig_Error_Syntax('Invalid DEFINE', $token->getLine(), $this->parser->getFilename()); + } + $stream->expect(\Twig_Token::BLOCK_END_TYPE); } else { $capture = true; |