aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-01-06 15:29:40 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-01-06 15:29:40 +0100
commit166320ef9edd0f8c5e6ddaee35f05741c274eb4e (patch)
tree223db0dcbce80219a42d291a7559c063b1cc0b7f
parentf423c2803a1aae09d1ea23ae3ec66b46c5d41312 (diff)
parent9d7acd189713d3d31a6ac347974e1e88c247d21c (diff)
downloadforums-166320ef9edd0f8c5e6ddaee35f05741c274eb4e.tar
forums-166320ef9edd0f8c5e6ddaee35f05741c274eb4e.tar.gz
forums-166320ef9edd0f8c5e6ddaee35f05741c274eb4e.tar.bz2
forums-166320ef9edd0f8c5e6ddaee35f05741c274eb4e.tar.xz
forums-166320ef9edd0f8c5e6ddaee35f05741c274eb4e.zip
Merge branch '3.1.x' into 3.2.x
-rw-r--r--phpBB/phpbb/template/twig/extension.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
index 92f87a0331..f0e716d697 100644
--- a/phpBB/phpbb/template/twig/extension.php
+++ b/phpBB/phpbb/template/twig/extension.php
@@ -170,8 +170,7 @@ class extension extends \Twig_Extension
$args = func_get_args();
$key = $args[0];
- $context = $this->context->get_data_ref();
- $context_vars = $context['.'][0];
+ $context_vars = $this->context->get_root_ref();
if (isset($context_vars['L_' . $key]))
{