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/node | |
| 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/node')
| -rw-r--r-- | phpBB/phpbb/template/twig/node/definenode.php | 3 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/node/includephp.php | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/phpbb/template/twig/node/definenode.php b/phpBB/phpbb/template/twig/node/definenode.php index 695ec4281f..c110785c4b 100644 --- a/phpBB/phpbb/template/twig/node/definenode.php +++ b/phpBB/phpbb/template/twig/node/definenode.php @@ -31,7 +31,8 @@ class definenode extends \Twig_Node { $compiler->addDebugInfo($this); - if ($this->getAttribute('capture')) { + if ($this->getAttribute('capture')) + { $compiler ->write("ob_start();\n") ->subcompile($this->getNode('value')) diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php index 826617e8e8..659495fd9e 100644 --- a/phpBB/phpbb/template/twig/node/includephp.php +++ b/phpBB/phpbb/template/twig/node/includephp.php @@ -47,7 +47,8 @@ class includephp extends \Twig_Node return; } - if ($this->getAttribute('ignore_missing')) { + if ($this->getAttribute('ignore_missing')) + { $compiler ->write("try {\n") ->indent() @@ -76,7 +77,8 @@ class includephp extends \Twig_Node ->write("}\n") ; - if ($this->getAttribute('ignore_missing')) { + if ($this->getAttribute('ignore_missing')) + { $compiler ->outdent() ->write("} catch (\Twig_Error_Loader \$e) {\n") |