diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-05-16 13:40:07 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-05-16 13:40:07 +0200 |
| commit | 3b91b243b0a89916619bb4dd6bd36aa6a62be5bf (patch) | |
| tree | d065ff89cecd80f43c7c05b115d3874b8fb7b3b6 /phpBB/phpbb/template/twig/tokenparser/defineparser.php | |
| parent | cddecec14647c980a688dc81834df2eae48e88bb (diff) | |
| parent | e52bc2d02283aab8fc0a588feec74ec8858c48f8 (diff) | |
| download | forums-3b91b243b0a89916619bb4dd6bd36aa6a62be5bf.tar forums-3b91b243b0a89916619bb4dd6bd36aa6a62be5bf.tar.gz forums-3b91b243b0a89916619bb4dd6bd36aa6a62be5bf.tar.bz2 forums-3b91b243b0a89916619bb4dd6bd36aa6a62be5bf.tar.xz forums-3b91b243b0a89916619bb4dd6bd36aa6a62be5bf.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/phpbb/template/twig/tokenparser/defineparser.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/tokenparser/defineparser.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/phpbb/template/twig/tokenparser/defineparser.php b/phpBB/phpbb/template/twig/tokenparser/defineparser.php index cfee84a363..2b88d61118 100644 --- a/phpBB/phpbb/template/twig/tokenparser/defineparser.php +++ b/phpBB/phpbb/template/twig/tokenparser/defineparser.php @@ -33,7 +33,8 @@ class defineparser extends \Twig_TokenParser $name = $this->parser->getExpressionParser()->parseExpression(); $capture = false; - if ($stream->test(\Twig_Token::OPERATOR_TYPE, '=')) { + if ($stream->test(\Twig_Token::OPERATOR_TYPE, '=')) + { $stream->next(); $value = $this->parser->getExpressionParser()->parseExpression(); @@ -45,7 +46,9 @@ class defineparser extends \Twig_TokenParser } $stream->expect(\Twig_Token::BLOCK_END_TYPE); - } else { + } + else + { $capture = true; $stream->expect(\Twig_Token::BLOCK_END_TYPE); |