From eee00652e7b608967a2ec5ee8fd165c2760be145 Mon Sep 17 00:00:00 2001 From: mrgoldy Date: Sun, 9 Dec 2018 23:58:34 +0100 Subject: [ticket/15905] Resolve conflicts PHPBB3-15905 --- phpBB/phpbb/template/twig/extension.php | 9 +++++---- 1 file 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]); -- cgit v1.2.1