hugo

commit b0326a1c0fca3a4cf07ba66e5cfd9d756a00629f
parent b5c718a4dee2061ad019260cb8762db522182509
Author: Cameron Moore <moorereason@gmail.com>
Date:   Wed, 16 Mar 2016 12:45:50 -0500

tpl: Treat booleans as set in default function

Booleans and `default` don't really make sense together, so we'll always treat
booleans as "set" and return the given value.

Diffstat:
M
docs/content/templates/functions.md
 | 
6
+++---
M
tpl/template_funcs.go
 | 
8
++++----
M
tpl/template_funcs_test.go
 | 
1
+

3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/docs/content/templates/functions.md b/docs/content/templates/functions.md
@@ -30,9 +30,9 @@ and other basic tools; these are listed in the
 
 ### default
 Checks whether a given value is set and returns a default value if it is not.
-"Set" in this context means true for booleans; non-zero for numeric types and
-times; non-zero length for strings, arrays, slices, and maps; any struct value;
-or non-nil for any other types.
+"Set" in this context means non-zero for numeric types and times;
+non-zero length for strings, arrays, slices, and maps;
+any boolean or struct value; or non-nil for any other types.
 
 e.g.
 
diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go
@@ -1318,9 +1318,9 @@ func dateFormat(layout string, v interface{}) (string, error) {
 }
 
 // dfault checks whether a given value is set and returns a default value if it
-// is not.  "Set" in this context means true for booleans; non-zero for numeric
-// types and times; non-zero length for strings, arrays, slices, and maps; any
-// struct value; or non-nil for any other types.
+// is not.  "Set" in this context means non-zero for numeric types and times;
+// non-zero length for strings, arrays, slices, and maps;
+// any boolean or struct value; or non-nil for any other types.
 func dfault(dflt interface{}, given ...interface{}) (interface{}, error) {
 	// given is variadic because the following construct will not pass a piped
 	// argument when the key is missing:  {{ index . "key" | default "foo" }}
@@ -1342,7 +1342,7 @@ func dfault(dflt interface{}, given ...interface{}) (interface{}, error) {
 
 	switch g.Kind() {
 	case reflect.Bool:
-		set = g.Bool()
+		set = true
 	case reflect.String, reflect.Array, reflect.Slice, reflect.Map:
 		set = g.Len() != 0
 	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
diff --git a/tpl/template_funcs_test.go b/tpl/template_funcs_test.go
@@ -1886,6 +1886,7 @@ func TestDefaultFunc(t *testing.T) {
 		given    interface{}
 		expected interface{}
 	}{
+		{true, false, false},
 		{"5", 0, "5"},
 
 		{"test1", "set", "set"},