Fixes #6020 -- Fix relative base URL redirects.
This commit is contained in:
parent
303a4a73ad
commit
7be64fbe06
|
@ -31,9 +31,9 @@ final class IndexAction
|
|||
|
||||
if (!($user instanceof Entity\User)) {
|
||||
// Redirect to a custom homepage URL if specified in settings.
|
||||
$homepageRedirect = $settings->getHomepageRedirectUrlAsUri();
|
||||
$homepageRedirect = $settings->getHomepageRedirectUrl();
|
||||
if (null !== $homepageRedirect) {
|
||||
return $response->withRedirect((string)$homepageRedirect, 302);
|
||||
return $response->withRedirect($homepageRedirect, 302);
|
||||
}
|
||||
|
||||
return $response->withRedirect($request->getRouter()->named('account:login'));
|
||||
|
|
|
@ -372,15 +372,6 @@ class Settings implements Stringable
|
|||
return $this->homepage_redirect_url;
|
||||
}
|
||||
|
||||
public function getHomepageRedirectUrlAsUri(): ?UriInterface
|
||||
{
|
||||
return Urls::tryParseUserUrl(
|
||||
$this->homepage_redirect_url,
|
||||
'Homepage Redirect URL',
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
public function setHomepageRedirectUrl(?string $homepageRedirectUrl): void
|
||||
{
|
||||
$this->homepage_redirect_url = $this->truncateNullableString($homepageRedirectUrl);
|
||||
|
|
Loading…
Reference in New Issue