hugo

commit 95f492114e33fc6e4d9dcfd2b7c1eca5c50d755f
parent c947351d7c4273b24663a56d8f32c8c011e9841f
Author: Carl Johnson <me@carlmjohnson.net>
Date:   Fri, 20 Mar 2020 09:35:41 -0400

Fix GetTerms nil pointer

Fixes #7061
Diffstat:
M
hugolib/page.go
 | 
2
+-
M
hugolib/taxonomy_test.go
 | 
6
++++--

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hugolib/page.go b/hugolib/page.go
@@ -141,7 +141,7 @@ func (p *pageState) GetTerms(taxonomy string) page.Pages {
 	if p.IsHome() {
 		// TODO(bep) make this less magical, see taxonomyEntries.Insert.
 		self = "/" + page.KindHome
-	} else {
+	} else if p.treeRef != nil {
 		self = p.treeRef.key
 	}
 
diff --git a/hugolib/taxonomy_test.go b/hugolib/taxonomy_test.go
@@ -625,7 +625,9 @@ Category Paginator {{ range $categories.Paginator.Pages }}{{ .RelPermalink }}|{{
 Cats Paginator {{ range $cats.Paginator.Pages }}{{ .RelPermalink }}|{{ end }}:END
 
 `)
-
+	b.WithTemplatesAdded("404.html", `
+404 Terms: {{ range .GetTerms "categories" }}{{.RelPermalink }}|{{ end }}:END
+	`)
 	b.Build(BuildCfg{})
 
 	cat := b.GetPage("categories")
@@ -647,7 +649,7 @@ Home Terms: /categories/dogs/|/categories/gorillas/|:END
 Cats Paginator /section/p1/|/section/|:END
 Category Paginator /categories/birds/|/categories/cats/|/categories/dogs/|/categories/funny/|/categories/gorillas/|:END
 `)
-
+	b.AssertFileContent("public/404.html", "\n404 Terms: :END\n\t")
 	b.AssertFileContent("public/categories/funny/index.xml", `<link>http://example.com/section/p1/</link>`)
 	b.AssertFileContent("public/categories/index.xml", `<link>http://example.com/categories/funny/</link>`)