mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-16 12:29:43 +02:00
[ticket/15905] Resolve conflicts
PHPBB3-15905
This commit is contained in:
parent
7989f3f71f
commit
eee00652e7
@ -95,6 +95,7 @@ class extension extends \Twig_Extension
|
||||
return array(
|
||||
new \Twig_SimpleFunction('lang', array($this, 'lang')),
|
||||
new \Twig_SimpleFunction('lang_defined', array($this, 'lang_defined')),
|
||||
new \Twig_SimpleFunction('get_class', 'get_class'),
|
||||
new \Twig_SimpleFunction('auth', array($this, 'get_auth')),
|
||||
new \Twig_SimpleFunction('auth_global', array($this, 'get_auth_global')),
|
||||
);
|
||||
|
Loading…
x
Reference in New Issue
Block a user