git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'jnovack/markdown'
[phorkie.git]
/
www
/
www-header.php
diff --git
a/www/www-header.php
b/www/www-header.php
index 64dca1104a1810d1a0d91977e9c86e4e37e21ee8..9aa873240aa2a3dff64a909f1c57b2c50e391f75 100644
(file)
--- a/
www/www-header.php
+++ b/
www/www-header.php
@@
-1,6
+1,7
@@
<?php
namespace phorkie;
session_start();
<?php
namespace phorkie;
session_start();
+
set_include_path(
__DIR__ . '/../src/'
. PATH_SEPARATOR . get_include_path()
set_include_path(
__DIR__ . '/../src/'
. PATH_SEPARATOR . get_include_path()
@@
-69,7
+70,11
@@
$twig = new \Twig_Environment(
);
//$twig->addExtension(new \Twig_Extension_Debug());
);
//$twig->addExtension(new \Twig_Extension_Debug());
-function render($tplname, $vars)
+if (!isset($noSecurityCheck) || $noSecurityCheck !== true) {
+ require __DIR__ . '/www-security.php';
+}
+
+function render($tplname, $vars = array())
{
$vars['css'] = $GLOBALS['phorkie']['cfg']['css'];
$vars['title'] = $GLOBALS['phorkie']['cfg']['title'];
{
$vars['css'] = $GLOBALS['phorkie']['cfg']['css'];
$vars['title'] = $GLOBALS['phorkie']['cfg']['title'];