From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Tue, 28 Jul 2015 23:19:29 +0000 (+0200)
Subject: Always use the template provided in page.Render
X-Git-Tag: v0.15~256
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=43891e39947ee30d6667ad4f8154b8c3d93fdd09;p=brevno-suite%2Fhugo

Always use the template provided in page.Render

Fixes #1306
---

diff --git a/hugolib/page.go b/hugolib/page.go
index 9b18f143..b139bbb7 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 {