mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-23 08:43:02 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Joas Schilling
2015-05-16 13:40:07 +02:00
parent cddecec146 e52bc2d022
commit 3b91b243b0
9 changed files with 167 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/phpbb/template/twig/node/definenode.php
View File

@@ -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'))

6
phpBB/phpbb/template/twig/node/includephp.php
View File

@@ -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")