git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do not run setupcheck on every page load
[phorkie.git]
/
www
/
www-header.php
diff --git
a/www/www-header.php
b/www/www-header.php
index 1888839746f7f7e5b3e2eb509da0f792d47bfded..c99f8c8ed774b54610ced1f97d7df067612b6d28 100644
(file)
--- a/
www/www-header.php
+++ b/
www/www-header.php
@@
-27,6
+27,7
@@
set_exception_handler(
if (!isset($GLOBALS['twig'])) {
echo '<h1>Exception</h1>';
echo '<p>' . $e->getMessage() . '</p>';
if (!isset($GLOBALS['twig'])) {
echo '<h1>Exception</h1>';
echo '<p>' . $e->getMessage() . '</p>';
+ echo "\n";
exit();
}
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 (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'];
// 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();
$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);
$template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
echo $template->render($vars);