From: Serge A. Zaitsev <zaitsev.serge@gmail.com>
Date: Sun, 30 Aug 2015 14:01:05 +0000 (+0200)
Subject: file, url and output should not be overridden by globals
X-Git-Tag: 0.0.1~20
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=61600d095116e7f45bcb17d2323d7b2348f5f5fc;p=aya.git

file, url and output should not be overridden by globals
---

diff --git a/zs.go b/zs.go
index a8d2c5a..a07bbdf 100644
--- a/zs.go
+++ b/zs.go
@@ -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
 	}