shithub: hugo

Info  •  Files  •  Log  •  Branches

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.

--- a/docs/content/templates/functions.md

+++ b/docs/content/templates/functions.md

@@ -30,9 +30,9 @@

 ### 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.

--- a/tpl/template_funcs.go

+++ b/tpl/template_funcs.go

@@ -1318,9 +1318,9 @@

 }

 // 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 @@

 	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:

--- a/tpl/template_funcs_test.go

+++ b/tpl/template_funcs_test.go

@@ -1886,6 +1886,7 @@

 		given    interface{}

 		expected interface{}

 	}{

+		{true, false, false},

 		{"5", 0, "5"},

 		{"test1", "set", "set"},