Upgrade to 3.8.1

2022-10-18 14:11:15 +02:00
parent 94b2a32baf
commit 9c93e01c3a
71 changed files with 633 additions and 5705 deletions
--- a/kirby/src/Http/Environment.php
+++ b/kirby/src/Http/Environment.php
@@ -786,12 +786,20 @@ class Environment

 		// load the config for the host
 		if (empty($host) === false) {
-			$configHost = F::load($root . '/config.' . $host . '.php', []);
+			$configHost = F::load(
+				file: $root . '/config.' . $host . '.php',
+				fallback: [],
+				allowOutput: false
+			);
 		}

 		// load the config for the server IP
 		if (empty($addr) === false) {
-			$configAddr = F::load($root . '/config.' . $addr . '.php', []);
+			$configAddr = F::load(
+				file: $root . '/config.' . $addr . '.php',
+				fallback: [],
+				allowOutput: false
+			);
 		}

 		return array_replace_recursive($configHost, $configAddr);