aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/template/twig
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/template/twig')
-rw-r--r--phpBB/includes/template/twig/twig.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index f5879c6027..717213ea1f 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -432,12 +432,11 @@ class phpbb_template_twig implements phpbb_template
*/
public function get_template_vars()
{
- $vars = array();
+ $context_vars = $this->context->get_data_ref();
$vars = array_merge(
- $vars,
- $this->context->get_rootref(),
- $this->context->get_tpldata(),
+ $context_vars['.'][0], // To get normal vars
+ $context_vars, // To get loops
array(
'definition' => new phpbb_template_twig_definition(),
'user' => $this->user,