diff options
| author | André Noack <noack@data-quest.de> | 2022-10-19 08:23:48 +0000 |
|---|---|---|
| committer | David Siegfried <david.siegfried@uni-vechta.de> | 2022-10-19 08:23:48 +0000 |
| commit | 2f85abeb817dba2476294f23fcdff91140ed2e95 (patch) | |
| tree | 3fb401db711bec94f4aea0de7970f4f1251b120e /lib | |
| parent | a862c55cc83aa342058d0c310a7b426327c335ef (diff) | |
Resolve #1688 "Fatal Error im bootstrap mit PHP 8.1"
Closes #1688
Merge request studip/studip!1090
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bootstrap.php | 9 | ||||
| -rw-r--r-- | lib/phplib/Seminar_Auth.class.php | 2 | ||||
| -rw-r--r-- | lib/phplib/Seminar_Session.class.php | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/lib/bootstrap.php b/lib/bootstrap.php index 1c3af70..3950eef 100644 --- a/lib/bootstrap.php +++ b/lib/bootstrap.php @@ -65,7 +65,14 @@ if (isset($_SERVER['SERVER_NAME'])) { $GLOBALS['ASSETS_URL'] = $ABSOLUTE_URI_STUDIP . 'assets/'; require __DIR__ . '/classes/StudipFileloader.php'; -$added = StudipFileloader::load('config_defaults.inc.php config_local.inc.php', $GLOBALS, compact('STUDIP_BASE_PATH', 'ABSOLUTE_URI_STUDIP', 'ASSETS_URL', 'CANONICAL_RELATIVE_PATH_STUDIP'), true); + +$added_configs = []; + +StudipFileloader::load('config_defaults.inc.php config_local.inc.php', $added_configs, compact('STUDIP_BASE_PATH', 'ABSOLUTE_URI_STUDIP', 'ASSETS_URL', 'CANONICAL_RELATIVE_PATH_STUDIP'), true); + +foreach($added_configs as $key => $value) { + $GLOBALS[$key] = $value; +} // If no ENV setting was found in the config files, assume ENV=production if (!defined('Studip\ENV')) { diff --git a/lib/phplib/Seminar_Auth.class.php b/lib/phplib/Seminar_Auth.class.php index c1c2b86..3a915e5 100644 --- a/lib/phplib/Seminar_Auth.class.php +++ b/lib/phplib/Seminar_Auth.class.php @@ -356,7 +356,7 @@ class Seminar_Auth if ($check_auth['uid']) { $uid = $check_auth['uid']; - if ($check_auth['need_email_activation'] == $uid) { + if (isset($check_auth['need_email_activation']) && $check_auth['need_email_activation'] == $uid) { $this->need_email_activation = $uid; $_SESSION['semi_logged_in'] = $uid; return false; diff --git a/lib/phplib/Seminar_Session.class.php b/lib/phplib/Seminar_Session.class.php index a5bc592..937a865 100644 --- a/lib/phplib/Seminar_Session.class.php +++ b/lib/phplib/Seminar_Session.class.php @@ -314,7 +314,7 @@ class Seminar_Session $this->delete(); $this->start(); foreach ($keep_session_vars as $k) { - $_SESSION[$k] = $keep[$k]; + $_SESSION[$k] = $keep[$k] ?? null; } } |