1 files changed, 9 insertions, 8 deletions

diff --git a/echo/error_handler.go b/echo/error_handler.go
index c32fe86..bfbcfb6 100644
--- a/echo/error_handler.go
+++ b/echo/error_handler.go
@@ -4,14 +4,14 @@ import (
         "bytes"
         "fmt"
         "html/template"
+        "io/fs"
         "net/http"
-        "path"
 
         "github.com/labstack/echo/v4"
 )
 
 // Copied from echo and tweaked to make our errors nicer
-func ErrorHandler(templatePath string, funcs template.FuncMap) func(error, echo.Context) {
+func ErrorHandler(templates fs.FS, funcs template.FuncMap) func(error, echo.Context) {
         return func(err error, c echo.Context) {
                 defer func() {
                         if r := recover(); r != nil {
@@ -37,12 +37,13 @@ func ErrorHandler(templatePath string, funcs template.FuncMap) func(error, echo.
                         }
                 }
 
-                t, err := template.New("").Funcs(funcs).ParseFiles(
-                        path.Join(templatePath, "404.tpl"),
-                        path.Join(templatePath, "40x.tpl"),
-                        path.Join(templatePath, "50x.tpl"),
-                        path.Join(templatePath, "header.tpl"),
-                        path.Join(templatePath, "footer.tpl"),
+                t, err := template.New("").Funcs(funcs).ParseFS(
+                        templates,
+                        "404.tpl",
+                        "40x.tpl",
+                        "50x.tpl",
+                        "header.tpl",
+                        "footer.tpl",
                 )
                 if err != nil {
                         he = &echo.HTTPError{