shithub: hugo

Info  •  Files  •  Log  •  Branches

Fix UTF8 permalink

Generate unencoded directory in public dir.

Fixes #988

--- a/hugolib/page.go

+++ b/hugolib/page.go

@@ -347,8 +347,8 @@

 func (p *Page) permalink() (*url.URL, error) {

 	baseURL := string(p.Site.BaseURL)

 	dir := strings.TrimSpace(filepath.ToSlash(p.Source.Dir()))

-	pSlug := strings.TrimSpace(p.Slug)

-	pURL := strings.TrimSpace(p.URL)

+	pSlug := strings.TrimSpace(helpers.URLize(p.Slug))

+	pURL := strings.TrimSpace(helpers.URLize(p.URL))

 	var permalink string

 	var err error

@@ -456,12 +456,12 @@

 		case "description":

 			p.Description = cast.ToString(v)

 		case "slug":

-			p.Slug = helpers.URLize(cast.ToString(v))

+			p.Slug = cast.ToString(v)

 		case "url":

 			if url := cast.ToString(v); strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://") {

 				return fmt.Errorf("Only relative URLs are supported, %v provided", url)

 			}

-			p.URL = helpers.URLize(cast.ToString(v))

+			p.URL = cast.ToString(v)

 		case "type":

 			p.contentType = cast.ToString(v)

 		case "extension", "ext":

@@ -821,6 +821,7 @@

 		var err error

 		outfile, err = override.Expand(p)

 		if err == nil {

+			outfile, _ = url.QueryUnescape(outfile)

 			if strings.HasSuffix(outfile, "/") {

 				outfile += "index.html"

 			}

--- a/hugolib/permalinks.go

+++ b/hugolib/permalinks.go

@@ -160,7 +160,7 @@

 		if strings.HasSuffix(p.Slug, "-") {

 			p.Slug = p.Slug[0 : len(p.Slug)-1]

 		}

-		return p.Slug, nil

+		return helpers.URLize(p.Slug), nil

 	}

 	return pageToPermalinkTitle(p, a)

 }