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/includephp.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/includephp.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/tokenparser/includephp.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/template/twig/tokenparser/includephp.php b/phpBB/phpbb/template/twig/tokenparser/includephp.php index 38196c5290..c09f7729b0 100644 --- a/phpBB/phpbb/template/twig/tokenparser/includephp.php +++ b/phpBB/phpbb/template/twig/tokenparser/includephp.php @@ -31,7 +31,8 @@ class includephp extends \Twig_TokenParser $stream = $this->parser->getStream(); $ignoreMissing = false; - if ($stream->test(\Twig_Token::NAME_TYPE, 'ignore')) { + if ($stream->test(\Twig_Token::NAME_TYPE, 'ignore')) + { $stream->next(); $stream->expect(\Twig_Token::NAME_TYPE, 'missing'); |