This commit is contained in:
2026-07-06 21:04:37 +03:30
parent fc3792902a
commit 61383a6dda
3 changed files with 44 additions and 3 deletions
+15 -1
View File
@@ -56,9 +56,12 @@ class File extends Model
$relative = self::normalizeRelativeStoragePath($trimmed);
$base = self::resolvePublicBaseUrl();
if ($base === '' || $relative === '') {
if ($relative === '') {
return null;
}
if ($base === '') {
return $relative;
}
return $base.'/'.$relative;
}
@@ -124,6 +127,17 @@ class File extends Model
return self::ensureAbsoluteUrl(self::ensureServerPublicBase(rtrim($appUrl, '/')));
}
try {
if (app()->bound('request')) {
$request = request();
$host = $request?->getSchemeAndHttpHost();
if (is_string($host) && $host !== '' && ! str_contains($host, 'localhost')) {
return self::ensureAbsoluteUrl(self::ensureServerPublicBase($host));
}
}
} catch (\Throwable) {
}
return '';
}