github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-12-27 21:10:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Restrict the new type layout resolution to page and section kinds"

Browse source 
This reverts commit 78e8a744b3.
This commit is contained in:
Bjørn Erik Pedersen 2018-07-09 10:29:16 +02:00
parent 6bc892fc24
commit 5dc1f95b63
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
hugolib/page.go
View file

@ -414,16 +414,14 @@ func (p *Page) createLayoutDescriptor() output.LayoutDescriptor {
var typeCurrentSection string
var typeRootSection string
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
}
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{