file, url and output should not be overridden by globals

This commit is contained in:
Serge A. Zaitsev 2015-08-30 16:01:05 +02:00
parent 70ba7396ff
commit 61600d0951
1 changed files with 6 additions and 6 deletions

12
zs.go
View File

@ -35,22 +35,22 @@ func md(path string, globals Vars) (Vars, string, error) {
s := string(b)
url := path[:len(path)-len(filepath.Ext(path))] + ".html"
v := Vars{
"file": path,
"url": url,
"title": "",
"description": "",
"keywords": "",
"output": filepath.Join(PUBDIR, url),
}
for name, value := range globals {
v[name] = value
}
if _, err := os.Stat(filepath.Join(ZSDIR, "layout.amber")); err == nil {
v["layout"] = "layout.amber"
} else {
v["layout"] = "layout.html"
}
v["file"] = path
v["url"] = url
v["output"] = filepath.Join(PUBDIR, url)
for name, value := range globals {
v[name] = value
}
if strings.Index(s, "\n\n") == -1 {
return v, s, nil
}