mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Fix incorrect asset URL (#15805) 

Fixes another regression from https://github.com/go-gitea/gitea/pull/15219.
This commit is contained in:
silverwind 2021-05-09 22:03:09 +02:00 committed by GitHub
parent 2e0f315617
commit 17a7797cdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/templates/helper.go
View File

@ -766,7 +766,7 @@ func ReactionToEmoji(reaction string) template.HTML {
if val != nil { if val != nil {
return template.HTML(val.Emoji) return template.HTML(val.Emoji)
} }
return template.HTML(fmt.Sprintf(`<img alt=":%s:" src="%s/img/emoji/%s.png"></img>`, reaction, setting.StaticURLPrefix, reaction)) return template.HTML(fmt.Sprintf(`<img alt=":%s:" src="%s/assets/img/emoji/%s.png"></img>`, reaction, setting.StaticURLPrefix, reaction))
} }
// RenderNote renders the contents of a git-notes file as a commit message. // RenderNote renders the contents of a git-notes file as a commit message.

2
routers/routes/web.go
View File

@ -173,7 +173,7 @@ func WebRoutes() *web.Route {
// this png is very likely to always be below the limit for gzip so it doesn't need to pass through gzip // this png is very likely to always be below the limit for gzip so it doesn't need to pass through gzip
routes.Get("/apple-touch-icon.png", func(w http.ResponseWriter, req *http.Request) { routes.Get("/apple-touch-icon.png", func(w http.ResponseWriter, req *http.Request) {
http.Redirect(w, req, path.Join(setting.StaticURLPrefix, "img/apple-touch-icon.png"), 301) http.Redirect(w, req, path.Join(setting.StaticURLPrefix, "/assets/img/apple-touch-icon.png"), 301)
}) })
gob.Register(&u2f.Challenge{}) gob.Register(&u2f.Challenge{})