X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/bc5dc89cb33243ff64064875b4bc2c629d812bb9..3e89794cd18eec5b921aa72471a6890fdf40846e:/www/www-header.php?ds=sidebyside diff --git a/www/www-header.php b/www/www-header.php index 1888839..c99f8c8 100644 --- a/www/www-header.php +++ b/www/www-header.php @@ -27,6 +27,7 @@ set_exception_handler( if (!isset($GLOBALS['twig'])) { echo '

Exception

'; echo '

' . $e->getMessage() . '

'; + echo "\n"; exit(); } @@ -45,9 +46,6 @@ require_once __DIR__ . '/../data/config.default.php'; if (file_exists(__DIR__ . '/../data/config.php')) { require_once __DIR__ . '/../data/config.php'; } -if ($GLOBALS['phorkie']['cfg']['setupcheck']) { - SetupCheck::run(); -} // Set/Get git commit session variables $_SESSION['ipaddr'] = $_SERVER['REMOTE_ADDR']; @@ -98,6 +96,9 @@ function render($tplname, $vars = array()) $vars['email'] = $_SESSION['email']; } $vars['db'] = new Database(); + if (!isset($vars['htmlhelper'])) { + $vars['htmlhelper'] = new HtmlHelper(); + } $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm'); echo $template->render($vars);