mirror/gohugoio-hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-05-11 05:54:58 +00:00
Code Issues Releases Activity

helpers: Return partially cleaned URL in case of error in URLPrep anyway

Browse Source 
Closes #2987
This commit is contained in:
Bjørn Erik Pedersen
2017-03-02 00:21:02 +01:00
parent 74ea81b885
commit 7acec3c639
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
helpers/url.go
View File

@@ -20,7 +20,6 @@ import (
"strings"
"github.com/PuerkitoBio/purell"
jww "github.com/spf13/jwalterweatherman"
)
type pathBridge struct {
@@ -297,17 +296,15 @@ func (p *PathSpec) URLizeAndPrep(in string) string {
// URLPrep applies misc sanitation to the given URL.
func (p *PathSpec) URLPrep(in string) string {
if p.uglyURLs {
x := Uglify(SanitizeURL(in))
return x
return Uglify(SanitizeURL(in))
}
x := PrettifyURL(SanitizeURL(in))
if path.Ext(x) == ".xml" {
return x
pretty := PrettifyURL(SanitizeURL(in))
if path.Ext(pretty) == ".xml" {
return pretty
}
url, err := purell.NormalizeURLString(x, purell.FlagAddTrailingSlash)
url, err := purell.NormalizeURLString(pretty, purell.FlagAddTrailingSlash)
if err != nil {
jww.ERROR.Printf("Failed to normalize URL string. Returning in = %q\n", in)
return in
return pretty
}
return url
}