aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-03-06 21:34:19 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-03-06 21:34:19 +0100
commit85c860c5811bcfede7ec953c497736011786304e (patch)
tree52663db0ad18e42699214ede11e6a5413d699feb /phpBB
parent5e7560845b7ace6f5360305d7e6068feb04c08d3 (diff)
parent54753e926df28b686937394bc675130647893639 (diff)
downloadforums-85c860c5811bcfede7ec953c497736011786304e.tar
forums-85c860c5811bcfede7ec953c497736011786304e.tar.gz
forums-85c860c5811bcfede7ec953c497736011786304e.tar.bz2
forums-85c860c5811bcfede7ec953c497736011786304e.tar.xz
forums-85c860c5811bcfede7ec953c497736011786304e.zip
Merge pull request #3471 from Nicofuma/ticket/13132
[ticket/13132] Twig: Add the loops content to the root context
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/template/twig/twig.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php
index 605d37e954..0e4c619029 100644
--- a/phpBB/phpbb/template/twig/twig.php
+++ b/phpBB/phpbb/template/twig/twig.php
@@ -352,6 +352,12 @@ class twig extends \phpbb\template\base
// cleanup
unset($vars['loops']['.']);
+ // Inject in the main context the value added by assign_block_vars() to be able to use directly the Twig loops.
+ foreach ($vars['loops'] as $key => &$value)
+ {
+ $vars[$key] = $value;
+ }
+
return $vars;
}