Use helpers.GetThemeDir() to find base templates.

Now that we have the helpers.GetThemeDir() function, use it instead of
calling directly into viper.

diff --git a/tpl/template.go b/tpl/template.go
index 7740850eb156b97da025195bc21b2e1986dd1aaa..14a912901980d69daab9c9f15c3cf609815c5d7f 100644 (file)
--- 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),