summaryrefslogtreecommitdiffstats
path: root/hugolib/page.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-03-19 11:40:54 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-03-27 15:43:56 +0200
commit08fa2b112407c1fe180e6c02dd8fe63735608336 (patch)
tree84751afb3578970eeeafe00e835e1c4aced1accd /hugolib/page.go
parent6178238a0b069ae8ce65a23e3dd60c091de0cfef (diff)
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.
Diffstat (limited to 'hugolib/page.go')
-rw-r--r--hugolib/page.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/hugolib/page.go b/hugolib/page.go
index 1308aa49d..2f21eb313 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...)
}