allow nil user map

R=r
DELTA=5  (3 added, 0 deleted, 2 changed)
OCL=27371
CL=27389

diff --git a/src/lib/template/template.go b/src/lib/template/template.go
index 1702889f4d733ab01f00f94436838a2811009090..824b9d626b248335237a2e529d62ce2bd7197c84 100644 (file)
--- a/src/lib/template/template.go
+++ b/src/lib/template/template.go
@@ -48,6 +48,7 @@ const (
 
 // FormatterMap is the type describing the mapping from formatter
 // names to the functions that implement them.
+// TODO(rsc): Maybe func should take interface{} instead?
 type FormatterMap map[string] func(reflect.Value) string
 
 // Built-in formatters.
@@ -446,8 +447,10 @@ func (t *template) evalVariable(name_formatter string) string {
        }
        val := t.varValue(name);
        // is it in user-supplied map?
-       if fn, ok := t.fmap[formatter]; ok {
-               return fn(val)
+       if t.fmap != nil {
+               if fn, ok := t.fmap[formatter]; ok {
+                       return fn(val)
+               }
        }
        // is it in builtin map?
        if fn, ok := builtins[formatter]; ok {