From 7e13b62b8fe13b4125e01c310c0491a7a48909d7 Mon Sep 17 00:00:00 2001 From: slawkens Date: Thu, 18 May 2023 19:06:50 +0200 Subject: [PATCH] Fix Twig error on create account --- system/init.php | 6 +++--- system/twig.php | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/system/init.php b/system/init.php index 037327c4..764cdd8b 100644 --- a/system/init.php +++ b/system/init.php @@ -31,9 +31,6 @@ if($config['gzip_output'] && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($ require_once SYSTEM . 'libs/cache.php'; $cache = Cache::getInstance(); -// twig -require_once SYSTEM . 'twig.php'; - // trim values we receive if(isset($_POST)) { @@ -126,6 +123,9 @@ require_once SYSTEM . 'libs/pot/OTS.php'; $ots = POT::getInstance(); require_once SYSTEM . 'database.php'; +// twig +require_once SYSTEM . 'twig.php'; + define('USE_ACCOUNT_NAME', $db->hasColumn('accounts', 'name')); // load vocation names $tmp = ''; diff --git a/system/twig.php b/system/twig.php index 19011de7..ee73f14f 100644 --- a/system/twig.php +++ b/system/twig.php @@ -16,6 +16,9 @@ $twig = new Twig_Environment($twig_loader, array( $twig_loader->addPath(PLUGINS); +$twig->addGlobal('logged', false); +$twig->addGlobal('account_logged', new OTS_Account()); + if($dev_mode) { $twig->addExtension(new Twig_DebugExtension()); }