shithub: hugo

Info  •  Files  •  Log  •  Branches

common: Fix elements are doubling when append a not assignable type

Fixes #6188

--- a/common/collections/append.go

+++ b/common/collections/append.go

@@ -65,6 +65,7 @@

 		fv := reflect.ValueOf(f)

 		if !fv.Type().AssignableTo(tot) {

 			// Fall back to a []interface{} slice.

+			tov, _ := indirect(reflect.ValueOf(to))

 			return appendToInterfaceSlice(tov, from...)

 		}

 		tov = reflect.Append(tov, fv)

--- a/common/collections/append_test.go

+++ b/common/collections/append_test.go

@@ -14,6 +14,7 @@

 package collections

 import (

+	"html/template"

 	"testing"

 	qt "github.com/frankban/quicktest"

@@ -31,6 +32,7 @@

 		{[]string{"a", "b"}, []interface{}{"c"}, []string{"a", "b", "c"}},

 		{[]string{"a", "b"}, []interface{}{"c", "d", "e"}, []string{"a", "b", "c", "d", "e"}},

 		{[]string{"a", "b"}, []interface{}{[]string{"c", "d", "e"}}, []string{"a", "b", "c", "d", "e"}},

+		{[]string{"a"}, []interface{}{"b", template.HTML("c")}, []interface{}{"a", "b", template.HTML("c")}},

 		{nil, []interface{}{"a", "b"}, []string{"a", "b"}},

 		{nil, []interface{}{nil}, []interface{}{nil}},

 		{[]interface{}{}, []interface{}{[]string{"c", "d", "e"}}, []string{"c", "d", "e"}},