github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Make absURL properly handle baseURL with path component

Browse source
This commit is contained in:
Marek Janda 2015-11-02 21:28:29 +01:00 committed by Bjørn Erik Pedersen
parent 94c3825e5b
commit 0962470850
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
helpers/url.go
View file

@ -151,7 +151,17 @@ func AbsURL(path string) string {
if strings.HasPrefix(path, "http") || strings.HasPrefix(path, "//") { if strings.HasPrefix(path, "http") || strings.HasPrefix(path, "//") {
return path return path
} }
return MakePermalink(viper.GetString("BaseURL"), path).String()
baseURL := viper.GetString("BaseURL")
if strings.HasPrefix(path, "/") {
p, err := url.Parse(baseURL)
if err != nil {
panic(err)
}
p.Path = ""
baseURL = p.String()
}
return MakePermalink(baseURL, path).String()
} }
// RelURL creates a URL relative to the BaseURL root. // RelURL creates a URL relative to the BaseURL root.

2
helpers/url_test.go
View file

@ -53,6 +53,8 @@ func TestAbsURL(t *testing.T) {
{"/test/2/foo/", "http://base", "http://base/test/2/foo/"}, {"/test/2/foo/", "http://base", "http://base/test/2/foo/"},
{"http://abs", "http://base/", "http://abs"}, {"http://abs", "http://base/", "http://abs"},
{"//schemaless", "http://base/", "//schemaless"}, {"//schemaless", "http://base/", "//schemaless"},
{"test/2/foo/", "http://base/path", "http://base/path/test/2/foo/"},
{"/test/2/foo/", "http://base/path", "http://base/test/2/foo/"},
} }
for _, test := range tests { for _, test := range tests {