mirror/gohugoio-hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-05-11 05:54:58 +00:00
Code Issues Releases Activity

hugolib: Improve nil handling in IsDescendant and IsAncestor

Browse Source 
Fixes #5461
This commit is contained in:
Bjørn Erik Pedersen
2018-11-28 12:36:59 +01:00
parent 7540a62834
commit b09a40333f
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hugolib/site_sections.go
View File

@@ -104,8 +104,11 @@ func (p *Page) InSection(other interface{}) (bool, error) {
// IsDescendant returns 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.
func (p *Page) IsDescendant(other interface{}) (bool, error) {
if p == nil {
return false, nil
}
pp, err := unwrapPage(other)
if err != nil {
if err != nil || pp == nil {
return false, err
}
@@ -119,8 +122,12 @@ func (p *Page) IsDescendant(other interface{}) (bool, error) {
// IsAncestor returns 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.
func (p *Page) IsAncestor(other interface{}) (bool, error) {
if p == nil {
return false, nil
}
pp, err := unwrapPage(other)
if err != nil {
if err != nil || pp == nil {
return false, err
}