Merge branch 'develop-patch' into develop-minor

getkirby · Dec 27, 2023 · 9ddc04d · 9ddc04d
2 parents aad45f8 + 8eed778
commit 9ddc04d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/Http/Environment.php b/src/Http/Environment.php
@@ -753,6 +753,10 @@ public function isLocal(): bool
 			return true;
 		}
 
+		if (Str::endsWith($host, '.ddev.site') === true) {
+			return true;
+		}
+
 		// collect all possible visitor ips
 		$ips = [
 			$this->get('REMOTE_ADDR'),

diff --git a/tests/Http/EnvironmentTest.php b/tests/Http/EnvironmentTest.php
@@ -1050,6 +1050,7 @@ public static function isLocalWithServerNameProvider(): array
 			['localhost', true],
 			['mydomain.local', true],
 			['mydomain.test', true],
+			['mydomain.ddev.site', true],
 			['mydomain.com', false],
 			['mydomain.dev', false],
 		];