git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrate local copy of Bootstrap and Font-Awesome
[phorkie.git]
/
www
/
www-header.php
diff --git
a/www/www-header.php
b/www/www-header.php
index 290e680015900ca445bb25ad599e0d3779837f6f..9aa873240aa2a3dff64a909f1c57b2c50e391f75 100644
(file)
--- a/
www/www-header.php
+++ b/
www/www-header.php
@@
-1,8
+1,6
@@
<?php
namespace phorkie;
<?php
namespace phorkie;
-if (session_id() == "") {
- session_start();
-}
+session_start();
set_include_path(
__DIR__ . '/../src/'
set_include_path(
__DIR__ . '/../src/'
@@
-72,7
+70,9
@@
$twig = new \Twig_Environment(
);
//$twig->addExtension(new \Twig_Extension_Debug());
);
//$twig->addExtension(new \Twig_Extension_Debug());
-require __DIR__ . '/www-security.php';
+if (!isset($noSecurityCheck) || $noSecurityCheck !== true) {
+ require __DIR__ . '/www-security.php';
+}
function render($tplname, $vars = array())
{
function render($tplname, $vars = array())
{