github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-03-23 09:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

helpers: Use net/url for URL parsing in AbsURL

Browse source 
Fixes #2112
This commit is contained in:
Cameron Moore 2016-04-27 09:54:44 -05:00
parent 16b71bbbb4
commit e4ee1b89ad
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
helpers/url.go
View file

@ -148,7 +148,12 @@ func MakePermalink(host, plink string) *url.URL {
// AbsURL creates a absolute URL from the relative path given and the BaseURL set in config. // AbsURL creates a absolute URL from the relative path given and the BaseURL set in config.
func AbsURL(path string) string { func AbsURL(path string) string {
if strings.HasPrefix(path, "http") || strings.HasPrefix(path, "//") { url, err := url.Parse(path)
if err != nil {
return path
}
if url.IsAbs() || strings.HasPrefix(path, "//") {
return path return path
} }

2
helpers/url_test.go
View file

@ -52,9 +52,11 @@ func TestAbsURL(t *testing.T) {
{"", "http://base/ace/", "http://base/ace/"}, {"", "http://base/ace/", "http://base/ace/"},
{"/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"},
{"schema://abs", "http://base/", "schema://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/path/test/2/foo/"},
{"/test/2/foo/", "http://base/path", "http://base/test/2/foo/"}, {"/test/2/foo/", "http://base/path", "http://base/test/2/foo/"},
{"http//foo", "http://base/path", "http://base/path/http/foo"},
} }
for _, test := range tests { for _, test := range tests {