diff options
Diffstat (limited to 'modules/templates')
| -rw-r--r-- | modules/templates/dynamic.go | 9 | ||||
| -rw-r--r-- | modules/templates/static.go | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/modules/templates/dynamic.go b/modules/templates/dynamic.go index 4732fce421..fde58a4a70 100644 --- a/modules/templates/dynamic.go +++ b/modules/templates/dynamic.go @@ -9,7 +9,6 @@ package templates import ( "html/template" - "io/ioutil" "os" "path" "path/filepath" @@ -28,14 +27,14 @@ var ( // GetAsset returns asset content via name func GetAsset(name string) ([]byte, error) { - bs, err := ioutil.ReadFile(filepath.Join(setting.CustomPath, name)) + bs, err := os.ReadFile(filepath.Join(setting.CustomPath, name)) if err != nil && !os.IsNotExist(err) { return nil, err } else if err == nil { return bs, nil } - return ioutil.ReadFile(filepath.Join(setting.StaticRootPath, name)) + return os.ReadFile(filepath.Join(setting.StaticRootPath, name)) } // GetAssetNames returns assets list @@ -71,7 +70,7 @@ func Mailer() (*texttmpl.Template, *template.Template) { continue } - content, err := ioutil.ReadFile(path.Join(staticDir, filePath)) + content, err := os.ReadFile(path.Join(staticDir, filePath)) if err != nil { log.Warn("Failed to read static %s template. %v", filePath, err) @@ -100,7 +99,7 @@ func Mailer() (*texttmpl.Template, *template.Template) { continue } - content, err := ioutil.ReadFile(path.Join(customDir, filePath)) + content, err := os.ReadFile(path.Join(customDir, filePath)) if err != nil { log.Warn("Failed to read custom %s template. %v", filePath, err) diff --git a/modules/templates/static.go b/modules/templates/static.go index ee20b2af3b..fdd68c1e6a 100644 --- a/modules/templates/static.go +++ b/modules/templates/static.go @@ -9,7 +9,7 @@ package templates import ( "html/template" - "io/ioutil" + "io" "os" "path" "path/filepath" @@ -28,7 +28,7 @@ var ( // GetAsset get a special asset, only for chi func GetAsset(name string) ([]byte, error) { - bs, err := ioutil.ReadFile(filepath.Join(setting.CustomPath, name)) + bs, err := os.ReadFile(filepath.Join(setting.CustomPath, name)) if err != nil && !os.IsNotExist(err) { return nil, err } else if err == nil { @@ -103,7 +103,7 @@ func Mailer() (*texttmpl.Template, *template.Template) { continue } - content, err := ioutil.ReadFile(path.Join(customDir, filePath)) + content, err := os.ReadFile(path.Join(customDir, filePath)) if err != nil { log.Warn("Failed to read custom %s template. %v", filePath, err) @@ -130,7 +130,7 @@ func Asset(name string) ([]byte, error) { return nil, err } defer f.Close() - return ioutil.ReadAll(f) + return io.ReadAll(f) } func AssetNames() []string { |