From: Bjørn Erik Pedersen Date: Sat, 22 Feb 2020 09:57:43 +0000 (+0100) Subject: Fix crashes for 404 in IsAncestor etc. X-Git-Tag: v0.65.3~5 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a524124beb0e7ca226c207ea48a90cea2cbef76e;p=brevno-suite%2Fhugo Fix crashes for 404 in IsAncestor etc. Fixes #6931 --- diff --git a/docs/content/en/readfiles/sectionvars.md b/docs/content/en/readfiles/sectionvars.md index 698955c0..45aaff1f 100644 --- a/docs/content/en/readfiles/sectionvars.md +++ b/docs/content/en/readfiles/sectionvars.md @@ -5,13 +5,13 @@ : The page's first section below root, e.g. `/docs`, `/blog` etc. .InSection $anotherPage -: Whether the given page is in the current section. Note that this will always return false for pages that are not either regular, home or section pages. +: Whether the given page is in the current section. .IsAncestor $anotherPage -: Whether the current page is an ancestor of the given page. Note that this method is not relevant for taxonomy lists and taxonomy terms pages. +: Whether the current page is an ancestor of the given page. .IsDescendant $anotherPage -: Whether the current page is a descendant of the given page. Note that this method is not relevant for taxonomy lists and taxonomy terms pages. +: Whether the current page is a descendant of the given page. .Parent : A section's parent section or a page's section. diff --git a/hugolib/404_test.go b/hugolib/404_test.go index 6dea9295..cd203a66 100644 --- a/hugolib/404_test.go +++ b/hugolib/404_test.go @@ -21,15 +21,41 @@ func Test404(t *testing.T) { t.Parallel() b := newTestSitesBuilder(t) - b.WithSimpleConfigFile().WithTemplatesAdded("404.html", "Not Found! Parent: {{ .Parent.Kind }}") + b.WithSimpleConfigFile().WithTemplatesAdded( + "404.html", + ` +{{ $home := site.Home }} +404: +Parent: {{ .Parent.Kind }} +IsAncestor: {{ .IsAncestor $home }}/{{ $home.IsAncestor . }} +IsDescendant: {{ .IsDescendant $home }}/{{ $home.IsDescendant . }} +CurrentSection: {{ .CurrentSection.Kind }}| +FirstSection: {{ .FirstSection.Kind }}| +InSection: {{ .InSection $home.Section }}|{{ $home.InSection . }} +Sections: {{ len .Sections }}| +Page: {{ .Page.RelPermalink }}| +Data: {{ len .Data }}| + +`, + ) 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 + + 404: Parent: home +IsAncestor: false/true +IsDescendant: true/false +CurrentSection: home| +FirstSection: home| +InSection: false|true +Sections: 0| +Page: /404.html| +Data: 1| + `) } diff --git a/hugolib/content_map_page.go b/hugolib/content_map_page.go index 18b2ee1a..143de535 100644 --- a/hugolib/content_map_page.go +++ b/hugolib/content_map_page.go @@ -806,6 +806,9 @@ func (b *pagesMapBucket) getPagesAndSections() page.Pages { func (b *pagesMapBucket) getSections() page.Pages { b.sectionsInit.Do(func() { + if b.owner.treeRef == nil { + return + } b.sections = b.owner.treeRef.collectSections() }) diff --git a/hugolib/page__tree.go b/hugolib/page__tree.go index 2c352892..bd7b586b 100644 --- a/hugolib/page__tree.go +++ b/hugolib/page__tree.go @@ -37,6 +37,15 @@ func (pt pageTree) IsAncestor(other interface{}) (bool, error) { ref1, ref2 := pt.p.getTreeRef(), tp.getTreeRef() + if ref1 == nil || ref2 == nil { + if ref1 == nil { + // A 404 or other similar standalone page. + return false, nil + } + + return ref1.n.p.IsHome(), nil + } + if !ref1.isSection() { return false, nil } @@ -66,6 +75,15 @@ func (pt pageTree) IsDescendant(other interface{}) (bool, error) { ref1, ref2 := pt.p.getTreeRef(), tp.getTreeRef() + if ref1 == nil || ref2 == nil { + if ref2 == nil { + // A 404 or other similar standalone page. + return false, nil + } + + return ref2.n.p.IsHome(), nil + } + if !ref2.isSection() { return false, nil } @@ -76,6 +94,9 @@ func (pt pageTree) IsDescendant(other interface{}) (bool, error) { func (pt pageTree) FirstSection() page.Page { ref := pt.p.getTreeRef() + if ref == nil { + return pt.p.s.home + } key := ref.key if !ref.isSection() { key = path.Dir(key) @@ -99,6 +120,14 @@ func (pt pageTree) InSection(other interface{}) (bool, error) { ref1, ref2 := pt.p.getTreeRef(), tp.getTreeRef() + if ref1 == nil || ref2 == nil { + if ref1 == nil { + // A 404 or other similar standalone page. + return false, nil + } + return ref1.n.p.IsHome(), nil + } + s1, _ := ref1.getCurrentSection() s2, _ := ref2.getCurrentSection() @@ -123,7 +152,7 @@ func (pt pageTree) Parent() page.Page { tree := p.getTreeRef() - if pt.p.Kind() == page.KindTaxonomyTerm || tree == nil { + if tree == nil || pt.p.Kind() == page.KindTaxonomyTerm { return pt.p.s.home }