From c4ad8f6498ea5b629b68a39f2e9877313c17f4d3 Mon Sep 17 00:00:00 2001 From: Jonathan Anderson Date: Fri, 19 Jun 2015 11:00:34 -0230 Subject: [PATCH] Use helpers.GetThemeDir() to find base templates. Now that we have the helpers.GetThemeDir() function, use it instead of calling directly into viper. --- tpl/template.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tpl/template.go b/tpl/template.go index 7740850eb..14a912901 100644 --- a/tpl/template.go +++ b/tpl/template.go @@ -21,7 +21,6 @@ import ( "github.com/spf13/hugo/helpers" "github.com/spf13/hugo/hugofs" jww "github.com/spf13/jwalterweatherman" - "github.com/spf13/viper" "github.com/yosssi/ace" "html/template" "io" @@ -306,8 +305,7 @@ func (t *GoHTMLTemplate) loadTemplates(absPath string, prefix string) { currBaseAceFilename := fmt.Sprintf("%s-%s", helpers.Filename(path), baseAceFilename) templateDir := filepath.Dir(path) - themeDir := filepath.Join( - viper.GetString("WorkingDir"), "themes", viper.GetString("theme")) + themeDir := helpers.GetThemeDir() pathsToCheck := []string{ filepath.Join(templateDir, currBaseAceFilename),