diff options
| author | mrgoldy <gijsmartens1@gmail.com> | 2018-12-09 23:58:34 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-25 20:08:40 +0200 |
| commit | eee00652e7b608967a2ec5ee8fd165c2760be145 (patch) | |
| tree | 0470488d89667d61770198d465fc0fd610db65c8 | |
| parent | 7989f3f71fd665aa743d947c7487d41c6f0a33d4 (diff) | |
| download | forums-eee00652e7b608967a2ec5ee8fd165c2760be145.tar forums-eee00652e7b608967a2ec5ee8fd165c2760be145.tar.gz forums-eee00652e7b608967a2ec5ee8fd165c2760be145.tar.bz2 forums-eee00652e7b608967a2ec5ee8fd165c2760be145.tar.xz forums-eee00652e7b608967a2ec5ee8fd165c2760be145.zip | |
[ticket/15905] Resolve conflicts
PHPBB3-15905
| -rw-r--r-- | phpBB/phpbb/template/twig/extension.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index 5bb0c67291..384bac773a 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -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')), ); @@ -196,10 +197,10 @@ class extension extends \Twig_Extension } /** - * Check if a language variable exists - * - * @return bool - */ + * Check if a language variable exists + * + * @return bool + */ public function lang_defined($key) { return call_user_func_array([$this->language, 'is_set'], [$key]); |