From: Cameron Moore <moorereason@gmail.com>
Date: Tue, 27 Dec 2016 02:36:08 +0000 (-0600)
Subject: hugolib: Fix redundant URL file extension on taxonomy terms pages
X-Git-Tag: v0.19~173
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=17f85178;p=brevno-suite%2Fhugo

hugolib: Fix redundant URL file extension on taxonomy terms pages

Fixes #2819
---

diff --git a/hugolib/node_as_page_test.go b/hugolib/node_as_page_test.go
index 5cca25fb..9836d92a 100644
--- a/hugolib/node_as_page_test.go
+++ b/hugolib/node_as_page_test.go
@@ -222,6 +222,19 @@ func doTestNodesWithNoContentFile(t *testing.T, ugly bool) {
 		"Taxonomy Terms Title: Categories",
 	)
 
+	pages := s.findPagesByKind(KindTaxonomyTerm)
+	for _, p := range pages {
+		var want string
+		if ugly {
+			want = "/" + p.Site.pathSpec.URLize(p.Title) + ".html"
+		} else {
+			want = "/" + p.Site.pathSpec.URLize(p.Title) + "/"
+		}
+		if p.URL() != want {
+			t.Errorf("Taxonomy term URL mismatch: want %q, got %q", want, p.URL())
+		}
+	}
+
 	// Sections
 	assertFileContent(t, expectedFilePath(ugly, "public", "sect1"), false,
 		"Section Title: Sect1s",
diff --git a/hugolib/page.go b/hugolib/page.go
index 1681216b..06daf97b 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -758,7 +758,7 @@ func (p *Page) createPermalink() (*url.URL, error) {
 		// No permalink config for nodes (currently)
 		pURL := strings.TrimSpace(p.Site.pathSpec.URLize(p.URLPath.URL))
 		pURL = p.addLangPathPrefix(pURL)
-		pURL = p.Site.pathSpec.URLPrep(path.Join(pURL, "index."+p.Extension()))
+		pURL = p.Site.pathSpec.URLPrep(pURL)
 		url := helpers.MakePermalink(baseURL, pURL)
 		return url, nil
 	}