diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2015-07-29 01:19:29 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2015-07-29 01:19:29 +0200 |
| commit | 43891e39947ee30d6667ad4f8154b8c3d93fdd09 (patch) | |
| tree | 0c24a827faa04eb684cdc44fd4479aa9fbaa6777 /hugolib | |
| parent | 3037d200cb03dd58eaa95e5ded5cf8e319c45f66 (diff) | |
Always use the template provided in page.Render
Fixes #1306
Diffstat (limited to 'hugolib')
| -rw-r--r-- | hugolib/page.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hugolib/page.go b/hugolib/page.go index 9b18f1430..b139bbb79 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -704,13 +704,15 @@ func (p *Page) Menus() PageMenus { } func (p *Page) Render(layout ...string) template.HTML { - curLayout := "" + var l []string if len(layout) > 0 { - curLayout = layout[0] + l = layouts(p.Type(), layout[0]) + } else { + l = p.Layout() } - return tpl.ExecuteTemplateToHTML(p, p.Layout(curLayout)...) + return tpl.ExecuteTemplateToHTML(p, l...) } func (p *Page) guessMarkupType() string { |