From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sat, 30 Jun 2018 14:50:02 +0000 (+0200)
Subject: Restrict the new type layout resolution to page and section kinds
X-Git-Tag: v0.43~25
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=78e8a744b34e885e8169bf0a8bb64c73288e555a;p=brevno-suite%2Fhugo

Restrict the new type layout resolution to page and section kinds

Will have to test and evaluate this a little.

See  #4891
---

diff --git a/hugolib/page.go b/hugolib/page.go
index 458b96b2..13907c39 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -407,14 +407,16 @@ func (p *Page) createLayoutDescriptor() output.LayoutDescriptor {
 
 	var typeCurrentSection string
 	var typeRootSection string
-	curr := p.CurrentSection()
-	// Make sure we use the contentType only. This is the value from front matter.
-	if curr != nil {
-		typeCurrentSection = curr.contentType
-	}
-	first := p.FirstSection()
-	if first != nil {
-		typeRootSection = first.contentType
+	if p.Kind == KindPage || p.Kind == KindSection {
+		curr := p.CurrentSection()
+		// Make sure we use the contentType only. This is the value from front matter.
+		if curr != nil {
+			typeCurrentSection = curr.contentType
+		}
+		first := p.FirstSection()
+		if first != nil {
+			typeRootSection = first.contentType
+		}
 	}
 
 	return output.LayoutDescriptor{