summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorFelix Favre <gnomus@gnomus.de>2015-06-07 15:06:24 +0200
committerFelix Favre <gnomus@gnomus.de>2015-06-07 15:06:24 +0200
commitc88b1adcfe6a3affd17158db3d26789cc3103864 (patch)
treea4751d1c484855aacce4fee6506ea8cd8272fca1 /includes
parentdc2c986522cad1878ab6a58a3c134501c72204cc (diff)
parentc6c0e8f2ff590fd5b23159d2f1de219dbb000505 (diff)
Merge branch 'master' of github.com:engelsystem/engelsystem
Diffstat (limited to 'includes')
-rw-r--r--includes/engelsystem_provider.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/engelsystem_provider.php b/includes/engelsystem_provider.php
index 56d12de6..1fe06e77 100644
--- a/includes/engelsystem_provider.php
+++ b/includes/engelsystem_provider.php
@@ -71,7 +71,9 @@ require_once realpath(__DIR__ . '/../includes/pages/user_shifts.php');
require_once realpath(__DIR__ . '/../vendor/parsedown/Parsedown.php');
-session_lifetime(24 * 60, preg_replace("/[^a-z0-9-]/", '', md5(__DIR__)));
+if (! defined('PHPUNIT_TESTSUITE')) {
+ session_lifetime(24 * 60, preg_replace("/[^a-z0-9-]/", '', md5(__DIR__)));
+}
session_start();
gettext_init();