Initialize funcMap in an init function.

diff --git a/tpl/template.go b/tpl/template.go
index a67e82f8f285ceb197366e094775d2599d45b00e..197703a73d0b1a08375410694739952efd35bab1 100644 (file)
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -36,6 +36,7 @@ import (
 
 var localTemplates *template.Template
 var tmpl Template
+var funcMap template.FuncMap
 
 type Template interface {
        ExecuteTemplate(wr io.Writer, name string, data interface{}) error
@@ -84,40 +85,6 @@ func New() Template {
 
        localTemplates = &templates.Template
 
-       funcMap := template.FuncMap{
-               "urlize":      helpers.Urlize,
-               "sanitizeurl": helpers.SanitizeUrl,
-               "eq":          Eq,
-               "ne":          Ne,
-               "gt":          Gt,
-               "ge":          Ge,
-               "lt":          Lt,
-               "le":          Le,
-               "in":          In,
-               "intersect":   Intersect,
-               "isset":       IsSet,
-               "echoParam":   ReturnWhenSet,
-               "safeHtml":    SafeHtml,
-               "markdownify": Markdownify,
-               "first":       First,
-               "where":       Where,
-               "delimit":     Delimit,
-               "sort":        Sort,
-               "highlight":   Highlight,
-               "add":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '+') },
-               "sub":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '-') },
-               "div":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '/') },
-               "mod":         Mod,
-               "mul":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '*') },
-               "modBool":     ModBool,
-               "lower":       func(a string) string { return strings.ToLower(a) },
-               "upper":       func(a string) string { return strings.ToUpper(a) },
-               "title":       func(a string) string { return strings.Title(a) },
-               "partial":     Partial,
-               "ref":         Ref,
-               "relref":      RelRef,
-       }
-
        templates.Funcs(funcMap)
        templates.LoadEmbedded()
        return templates
@@ -1021,3 +988,39 @@ func (t *GoHtmlTemplate) LoadTemplatesWithPrefix(absPath string, prefix string)
 func (t *GoHtmlTemplate) LoadTemplates(absPath string) {
        t.loadTemplates(absPath, "")
 }
+
+func init() {
+       funcMap = template.FuncMap{
+               "urlize":      helpers.Urlize,
+               "sanitizeurl": helpers.SanitizeUrl,
+               "eq":          Eq,
+               "ne":          Ne,
+               "gt":          Gt,
+               "ge":          Ge,
+               "lt":          Lt,
+               "le":          Le,
+               "in":          In,
+               "intersect":   Intersect,
+               "isset":       IsSet,
+               "echoParam":   ReturnWhenSet,
+               "safeHtml":    SafeHtml,
+               "markdownify": Markdownify,
+               "first":       First,
+               "where":       Where,
+               "delimit":     Delimit,
+               "sort":        Sort,
+               "highlight":   Highlight,
+               "add":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '+') },
+               "sub":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '-') },
+               "div":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '/') },
+               "mod":         Mod,
+               "mul":         func(a, b interface{}) (interface{}, error) { return doArithmetic(a, b, '*') },
+               "modBool":     ModBool,
+               "lower":       func(a string) string { return strings.ToLower(a) },
+               "upper":       func(a string) string { return strings.ToUpper(a) },
+               "title":       func(a string) string { return strings.Title(a) },
+               "partial":     Partial,
+               "ref":         Ref,
+               "relref":      RelRef,
+       }
+}