X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/3937fc938f4e5c1d61348029bc54bbb06d00fd09..add0708f631532b284b11d5507c5efefce36b7c1:/www/www-header.php?ds=sidebyside

diff --git a/www/www-header.php b/www/www-header.php
index 0fd3c79..f381872 100644
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -21,6 +21,13 @@ set_exception_handler(
         } else {
             header('HTTP/1.0 500 Internal server error');
         }
+
+        if (!isset($GLOBALS['twig'])) {
+            echo '<h1>Exception</h1>';
+            echo '<p>' . $e->getMessage() . '</p>';
+            exit();
+        }
+
         render(
             'exception',
             array(
@@ -36,8 +43,9 @@ require_once __DIR__ . '/../data/config.default.php';
 if (file_exists(__DIR__ . '/../data/config.php')) {
     require_once __DIR__ . '/../data/config.php';
 }
-require_once 'VersionControl/Git.php';
-require_once 'Twig/Autoloader.php';
+if ($GLOBALS['phorkie']['cfg']['setupcheck']) {
+    SetupCheck::run();
+}
 \Twig_Autoloader::register();
 
 $loader = new \Twig_Loader_Filesystem($GLOBALS['phorkie']['cfg']['tpl']);