Merge branch '3.2.x'

* 3.2.x: [ticket/15666] Fix array key in twig lang() call
fededj · Jul 8, 2018 · d84af59 · d84af59
2 parents c565688 + 71905e5
commit d84af59
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
@@ -174,7 +174,7 @@ public function lang()
 
 		$context_vars = $this->context->get_root_ref();
 
-		if (isset($context_vars['L_' . $key]))
+		if (is_string($key) && isset($context_vars['L_' . $key]))
 		{
 			return $context_vars['L_' . $key];
 		}