From: Bjørn Erik Pedersen Date: Fri, 21 Feb 2020 07:06:38 +0000 (+0100) Subject: Fix panic in 404.Parent X-Git-Tag: v0.65.2~5 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4c2a0de412a850745ad32e580fcd65575192ca53;p=brevno-suite%2Fhugo Fix panic in 404.Parent Fixes #6924 --- diff --git a/hugolib/404_test.go b/hugolib/404_test.go index a4dc667a..6dea9295 100644 --- a/hugolib/404_test.go +++ b/hugolib/404_test.go @@ -21,13 +21,16 @@ func Test404(t *testing.T) { t.Parallel() b := newTestSitesBuilder(t) - b.WithSimpleConfigFile().WithTemplatesAdded("404.html", "Not Found!") + b.WithSimpleConfigFile().WithTemplatesAdded("404.html", "Not Found! Parent: {{ .Parent.Kind }}") b.Build(BuildCfg{}) // Note: We currently have only 1 404 page. One might think that we should have // multiple, to follow the Custom Output scheme, but I don't see how that would work // right now. - b.AssertFileContent("public/404.html", "Not Found") + b.AssertFileContent("public/404.html", ` +Not Found +Parent: home +`) } diff --git a/hugolib/page__tree.go b/hugolib/page__tree.go index 08fda228..2c352892 100644 --- a/hugolib/page__tree.go +++ b/hugolib/page__tree.go @@ -121,11 +121,13 @@ func (pt pageTree) Parent() page.Page { return nil } - if pt.p.Kind() == page.KindTaxonomyTerm { + tree := p.getTreeRef() + + if pt.p.Kind() == page.KindTaxonomyTerm || tree == nil { return pt.p.s.home } - _, b := p.getTreeRef().getSection() + _, b := tree.getSection() if b == nil { return nil }