makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 22:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15905] Resolve conflicts

Browse source 
PHPBB3-15905
This commit is contained in:
mrgoldy 2018-12-09 23:58:34 +01:00 • committed by Marc Alexander
parent 7989f3f71f
commit eee00652e7
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/phpbb/template/twig/extension.php
View file

@ -95,6 +95,7 @@ class extension extends \Twig_Extension
return array( return array(
new \Twig_SimpleFunction('lang', array($this, 'lang')), new \Twig_SimpleFunction('lang', array($this, 'lang')),
new \Twig_SimpleFunction('lang_defined', array($this, 'lang_defined')), 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', array($this, 'get_auth')),
new \Twig_SimpleFunction('auth_global', array($this, 'get_auth_global')), new \Twig_SimpleFunction('auth_global', array($this, 'get_auth_global')),
); );
@ -196,10 +197,10 @@ class extension extends \Twig_Extension
} }
/** /**
* Check if a language variable exists * Check if a language variable exists
* *
* @return bool * @return bool
*/ */
public function lang_defined($key) public function lang_defined($key)
{ {
return call_user_func_array([$this->language, 'is_set'], [$key]); return call_user_func_array([$this->language, 'is_set'], [$key]);