shithub: hugo

Info  •  Files  •  Log  •  Branches

{{ in }} should work with html.Template type

Fixes #7002

--- a/tpl/collections/collections.go

+++ b/tpl/collections/collections.go

@@ -292,12 +292,17 @@

 				return true, nil

 			}

 		}

-	case reflect.String:

-		if vv.Type() == lv.Type() && strings.Contains(lv.String(), vv.String()) {

-			return true, nil

-		}

 	}

-	return false, nil

+	ss, err := cast.ToStringE(l)

+	if err != nil {

+		return false, nil

+	}

+

+	su, err := cast.ToStringE(v)

+	if err != nil {

+		return false, nil

+	}

+	return strings.Contains(ss, su), nil

 }

 // Intersect returns the common elements in the given sets, l1 and l2.  l1 and

--- a/tpl/collections/collections_test.go

+++ b/tpl/collections/collections_test.go

@@ -345,6 +345,9 @@

 		// Structs

 		{pagesVals{p3v, p2v, p3v, p2v}, p2v, true},

 		{pagesVals{p3v, p2v, p3v, p2v}, p4v, false},

+		// template.HTML

+		{template.HTML("this substring should be found"), "substring", true},

+		{template.HTML("this substring should not be found"), "subseastring", false},

 	} {

 		errMsg := qt.Commentf("[%d] %v", i, test)