Always use the template provided in page.Render

Fixes #1306

diff --git a/hugolib/page.go b/hugolib/page.go
index 9b18f1430cf5897e6f4c56599d708aa893adb565..b139bbb79a1be2f10b552653ade746500dc75687 100644 (file)
--- 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 {