Merge 0035475214 into 2fdafd34ca

router/router.go

@@ -2,6 +2,7 @@ package router
 
 import (
 	"errors"
+	"html"
 	"io"
 	"io/fs"
 	"reflect"
@@ -115,7 +116,7 @@ func New(tmplDir fs.FS, extraData map[string]interface{}, secret [64]byte) *echo
 	//"htmlescaper": template.htmlEscaper,
 	funcs := template.FuncMap{
 		"StringsJoin": strings.Join,
-		"attrescaper": util.EscapeHtmlCode,
+		"attrescaper": html.EscapeString,
 	}
 	templates := make(map[string]*template.Template)
 	templates["login.html"] = template.Must(template.New("login").Funcs(funcs).Parse(tmplLoginString))

util/html.go

@@ -1,10 +0,0 @@
-package util
-
-import (
-	"html"
-)
-
-func EscapeHtmlCode(s string) string {
-	encodedString := html.EscapeString(s)
-	return encodedString
-}