Merge branch '3.1.x' into 3.2.x

marc1706 · marc1706 · commit 166320ef9edd · 2017-01-06T15:29:40.000+01:00
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
@@ -170,8 +170,7 @@ function lang()
 		$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]))
 		{

Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,7 @@ function lang()`
`170`	`170`	`$args = func_get_args();`
`171`	`171`	`$key = $args[0];`
`172`	`172`
`173`		`- $context = $this->context->get_data_ref();`
`174`		`- $context_vars = $context['.'][0];`
	`173`	`+ $context_vars = $this->context->get_root_ref();`
`175`	`174`
`176`	`175`	`if (isset($context_vars['L_' . $key]))`
`177`	`176`	`{`