From: Cameron Moore <moorereason@gmail.com>
Date: Mon, 5 Feb 2018 04:13:52 +0000 (-0600)
Subject: tpl: Ensure site templates can override theme templates
X-Git-Tag: v0.36~7
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=084cf4191;p=brevno-suite%2Fhugo

tpl: Ensure site templates can override theme templates

The tplimpl package was misusing the TemplateLookupDescriptor.WorkingDir
field from the output package. By incorrectly setting it to the theme
directory instead of the site root, the user is unable to override theme
templates in some situations.

Fixes #3505
---

diff --git a/tpl/tplimpl/template.go b/tpl/tplimpl/template.go
index e13dd0aa..25757abc 100644
--- a/tpl/tplimpl/template.go
+++ b/tpl/tplimpl/template.go
@@ -443,7 +443,6 @@ func (t *templateHandler) loadTemplates(absPath string, prefix string) {
 			)
 
 			if themeDir != "" && strings.HasPrefix(absPath, themeDir) {
-				workingDir = themeDir
 				layoutDir = "layouts"
 			}