github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-17 00:57:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not return empty theme dirs

Browse source 
This prevents reading data etc. from the root.

Fixes #2320
This commit is contained in:
Bjørn Erik Pedersen 2016-07-30 16:21:57 +02:00
parent 4ddd5361c1
commit 5f5fccbc36
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
helpers/path.go
View file

@ -183,13 +183,15 @@ func GetThemeDataDirPath() (string, error) {
} }
func getThemeDirPath(path string) (string, error) { func getThemeDirPath(path string) (string, error) {
var themeDir string if !ThemeSet() {
if ThemeSet() { return "", errors.New("No theme set")
themeDir = filepath.Join(GetThemeDir(), path)
if _, err := os.Stat(themeDir); os.IsNotExist(err) {
return "", fmt.Errorf("Unable to find %s directory for theme %s in %s", path, viper.GetString("theme"), themeDir)
}
} }
themeDir := filepath.Join(GetThemeDir(), path)
if _, err := os.Stat(themeDir); os.IsNotExist(err) {
return "", fmt.Errorf("Unable to find %s directory for theme %s in %s", path, viper.GetString("theme"), themeDir)
}
return themeDir, nil return themeDir, nil
} }