Changeset 30 in code

Timestamp:

Aug 30, 2015, 2:01:05 PM (10 years ago)

Author:

zaitsev.serge

Message:

file, url and output should not be overridden by globals

File:

• trunk/zs.go (modified) (2 diffs)

trunk/zs.go

@@ -36 +36 @@
         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 {
@@ -48 +48 @@
                 v["layout"] = "layout.html"
         }
-
-        for name, value := range globals {
-                v[name] = value
-        }
+        v["file"] = path
+        v["url"] = url
+        v["output"] = filepath.Join(PUBDIR, url)
+
         if strings.Index(s, "\n\n") == -1 {
                 return v, s, nil