fixes #4034

Closes #4034

Merge request studip/studip!2889

lib/bootstrap.php

@@ -65,6 +65,16 @@ if (isset($_SERVER['SERVER_NAME'])) {
 $GLOBALS['ASSETS_URL'] = $ABSOLUTE_URI_STUDIP . 'assets/';
 $GLOBALS['ASSETS_PATH'] = $ABSOLUTE_PATH_STUDIP . 'assets/';
 
+// Check if instance is configured; redirect to install script if not
+if (!file_exists($GLOBALS['STUDIP_BASE_PATH'] . '/config/config_local.inc.php') && php_sapi_name() !== 'cli') {
+    require_once __DIR__ . '/classes/URLHelper.php';
+
+    URLHelper::setBaseUrl($GLOBALS['ABSOLUTE_URI_STUDIP']);
+    header('Location: ' . URLHelper::getURL('install.php'));
+    die;
+}
+
+// Load configuration
 require __DIR__ . '/classes/StudipFileloader.php';
 
 $added_configs = [];
@@ -80,14 +90,6 @@ if (!defined('Studip\ENV')) {
     define('Studip\ENV', DEFAULT_ENV);
 }
 
-if (!file_exists($GLOBALS['STUDIP_BASE_PATH'] . '/config/config_local.inc.php') && php_sapi_name() !== 'cli') {
-    require_once __DIR__ . '/classes/URLHelper.php';
-
-    URLHelper::setBaseUrl($GLOBALS['ABSOLUTE_URI_STUDIP']);
-    header('Location: ' . URLHelper::getURL('install.php'));
-    die;
-}
-
 require __DIR__ . '/bootstrap-autoload.php';
 
 // construct absolute URL for ASSETS_URL

lib/classes/StudipFileloader.php

@@ -27,6 +27,12 @@ class StudipFileloader
         $_oldVariableNames = array_keys(get_defined_vars());
 
         foreach (preg_split('/ /', $_filename, -1, PREG_SPLIT_NO_EMPTY) as $file) {
+            if (
+                !file_exists($file)
+                && !stream_resolve_include_path($file)
+            ) {
+                continue;
+            }
             include $file;
         }
         unset($file);