From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sun, 19 Mar 2017 10:40:54 +0000 (+0100)
Subject: hugolib: Fix layout lookup order for Render func
X-Git-Tag: v0.20~88
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=08fa2b112407c1fe180e6c02dd8fe63735608336;p=brevno-suite%2Fhugo

hugolib: Fix layout lookup order for Render func

Will have to fix this in a better way later in relation to the non-renderable pages.

But this commit brings the Hugo Benchmark down to "only slightly slower" than master.

```
benchmark           old ns/op       new ns/op       delta
BenchmarkHugo-4     10074504521     10071236251     -0.03%

benchmark           old allocs     new allocs     delta
BenchmarkHugo-4     43623091       49271859       +12.95%

benchmark           old bytes      new bytes      delta
BenchmarkHugo-4     9468322704     9725848376     +2.72%
```

Which is something we can work with.
---

diff --git a/hugolib/page.go b/hugolib/page.go
index 1308aa49..2f21eb31 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -657,8 +657,8 @@ func (p *Page) Section() string {
 }
 
 func (p *Page) layouts(layouts ...string) []string {
-	// TODO(bep) output
-	if len(p.layoutsCalculated) > 0 {
+	// TODO(bep) output the logic here needs to be redone.
+	if len(layouts) == 0 && len(p.layoutsCalculated) > 0 {
 		return p.layoutsCalculated
 	}
 
@@ -1285,9 +1285,8 @@ func (p *Page) Menus() PageMenus {
 	return p.pageMenus
 }
 
-func (p *Page) Render(layouts ...string) template.HTML {
-	l := p.layouts(layouts...)
-
+func (p *Page) Render(layout ...string) template.HTML {
+	l := p.layouts(layout...)
 	return p.s.Tmpl.ExecuteTemplateToHTML(p, l...)
 }