Merge branch 'develop' into feature/new-router

This commit is contained in:
slawkens
2021-12-05 06:11:00 +01:00
109 changed files with 253 additions and 1134 deletions

View File

@@ -214,6 +214,14 @@ if($config['backward_support']) {
require SYSTEM . 'router.php';
/**
* @var OTS_Account $account_logged
*/
if ($logged && admin()) {
$content .= $twig->render('admin-bar.html.twig', [
'username' => USE_ACCOUNT_NAME ? $account_logged->getName() : $account_logged->getId()
]);
}
$title_full = (isset($title) ? $title . ' - ' : '') . $config['lua']['serverName'];
require $template_path . '/' . $template_index;