Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix relative markdown links with anchors (#4058) #4073

Merged
merged 2 commits into from May 29, 2018
Merged

Fix relative markdown links with anchors (#4058) #4073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bea7fe6
Use ResolveReference instead of path.Join
jonasfranz May 29, 2018
98649b3
Merge branch 'release/v1.4' into release/v1.4
lunny May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 15 additions & 6 deletions modules/markup/html.go
View file
Open in desktop
Expand Up @@ -114,16 +114,25 @@ func cutoutVerbosePrefix(prefix string) string {

// URLJoin joins url components, like path.Join, but preserving contents
func URLJoin(base string, elems ...string) string {
u, err := url.Parse(base)
if !strings.HasSuffix(base, "/") {
base += "/"
}
baseURL, err := url.Parse(base)
if err != nil {
log.Error(4, "URLJoin: Invalid base URL %s", base)
return ""
}
joinArgs := make([]string, 0, len(elems)+1)
joinArgs = append(joinArgs, u.Path)
joinArgs = append(joinArgs, elems...)
u.Path = path.Join(joinArgs...)
return u.String()
joinedPath := path.Join(elems...)
argURL, err := url.Parse(joinedPath)
if err != nil {
log.Error(4, "URLJoin: Invalid arg %s", joinedPath)
return ""
}
joinedURL := baseURL.ResolveReference(argURL).String()
if !baseURL.IsAbs() {
return joinedURL[1:] // Removing leading '/'
}
return joinedURL
}

// RenderIssueIndexPatternOptions options for RenderIssueIndexPattern function
Expand Down
2 changes: 2 additions & 0 deletions modules/markup/html_test.go
View file
Open in desktop
Expand Up @@ -83,6 +83,8 @@ func TestURLJoin(t *testing.T) {
"a", "b/c/"),
newTest("a/b/d",
"a/", "b/c/", "/../d/"),
newTest("https://try.gitea.io/a/b/c#d",
"https://try.gitea.io", "a/b", "c#d"),
} {
assert.Equal(t, test.Expected, URLJoin(test.Base, test.Elements...))
}
Expand Down