Include absolute path in canonical url #109
Merged
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
Use url and baseurl to generate prefix for redirect url, but prefer github specific configuration if set. This leads to absolute paths as suggested. Fixes jekyll#29
| @@ -69,7 +69,7 @@ def redirect_url(site, item) | |||
| end | |||
|
|
|||
| def redirect_prefix(site) | |||
| config_github_url(site) || config_baseurl(site) || "" | |||
| config_github_url(site) || "#{config_url(site)}#{config_baseurl(site)}" | |||
There was a problem hiding this comment.
I think we can / should URI.join here.
|
@benbalter there you go |
| def config_url(site) | ||
| url = site.config.fetch('url', nil) || "" | ||
| baseurl = site.config.fetch('baseurl', nil) || "" | ||
| File.join url, baseurl |
There was a problem hiding this comment.
URI.join seems to fail for relative urls. Thus, I went with File.join like a few lines above.
See discussion of my first commit.
There was a problem hiding this comment.
Could both of the fetches be rewritten as fetch <KEY>, "" rather than fetch <KEY>, nil || ""?
There was a problem hiding this comment.
That breaks the tests. If the key is explicitly set to null, it returns null / not the default value, I think.
There was a problem hiding this comment.
Gotcha. Makes sense. Good catch.
|
🆒 This LGTM. @jekyll/plugin-core, please 👀 |
|
@parkr is @jekyll/plugin-core a real thing? Leads to an http 404... |
|
@jekyllbot: merge |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Use url and baseurl to generate prefix for redirect url, but prefer github
specific configuration if set. This leads to absolute paths as suggested.
Fixes #29