[6.x] Fix site URLs configured with Antlers being treated as external - #15250
Open
duncanmcclean wants to merge 1 commit into
Open
[6.x] Fix site URLs configured with Antlers being treated as external#15250duncanmcclean wants to merge 1 commit into
duncanmcclean wants to merge 1 commit into
Conversation
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RxbUD3x2pWcJerdNBoCK1E
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request fixes an issue where URLs on a site's own host were left untouched by
URL::tidy()when the site's URL is configured with Antlers, keeping trailing slashes on permalinks, canonical URLs, sitemap entries, etc. This mostly affects headless setups, where the site URLs (eg.{{ config:app:frontend_url }}/fr) point at a different host thanAPP_URL.This was happening because
URL::ensureSiteCaches()built its list of known site hosts fromrawConfig()['url']— the unresolved config value. An Antlers value like{{ config:app:frontend_url }}/frisn't an absolute URL, so it was filtered out of the list and the site's host was never recognised as belonging to the application. Single-host setups were unaffected because the host also matchesconfig('app.url'), which is checked separately.This PR fixes it by building the site caches from
$site->url()— the resolved config value theSiteobject has already computed by that point, so there's no extra parsing involved.Fixes #15232