hugo

commit 7acec3c63991f5f3f5907e6e3b3f531d77fa97c8
parent 74ea81b885adc64d0194df461cbc85667294d16e
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Thu,  2 Mar 2017 00:21:02 +0100

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

Closes #2987

Diffstat:
M
helpers/url.go
 | 
15
++++++---------

1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/helpers/url.go b/helpers/url.go
@@ -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
 }