FIX Fluent now respects existing base URL prefixes in URL segment fields when no fluent domain exists #523
Conversation
This file contains 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
…lds when no fluent domain exists
|
Looks good to me. |
tractorcow
approved these changes
Jun 4, 2019
tractorcow
reviewed
Jul 30, 2019
| @@ -264,15 +264,14 @@ protected function addLocalePrefixToUrlSegment(FieldList $fields) | |||
| if ($domain) { | |||
| $parentBase = Controller::join_links($domain->Link(), Director::baseURL()); | |||
| } else { | |||
| $parentBase = Director::absoluteBaseURL(); | |||
| // Use any existing pre-configured base URL prefix for the field | |||
| $parentBase = $segmentField->getURLPrefix(); | |||
There was a problem hiding this comment.
Ah, the bug is that this link includes the parent url, whereas so does $parentRelative. It's adding parent urlsegment twice.
There was a problem hiding this comment.
I have to revert this at #539
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fluent sets the URLSegment field's URLPrefix to be the base domain plus the parent page path including the current locale. When no fluent domains are configured, this defaulted to
Director::absoluteBaseURL(). This was a bit heavy handed, since it doesn't consider any previous modifications toSiteTreeURLSegmentField::setURLPrefix()(e.g. in subsites, where it sets the subsite domain).I've changed this to use the existing URL prefix instead.
There will still be conflicts if you use subsite domains and fluent domains at the same time, since they represent the same functionality, but that can be documented.
Fixes silverstripe/silverstripe-subsites#416