diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-02-25 06:34:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-24 22:34:51 +0000 |
| commit | 10c7996b5a5c705964fc6cc9c1817eea1fc436ef (patch) | |
| tree | aa05e188128ff0d985c0302d5b5a133e46046e8f /routers/web | |
| parent | ff9dc512438f1a3bc36cc8c419d8450f808517f9 (diff) | |
| download | gitea-10c7996b5a5c705964fc6cc9c1817eea1fc436ef.tar.gz gitea-10c7996b5a5c705964fc6cc9c1817eea1fc436ef.zip | |
Remove RenderEmojiPlain from template helper (#29375)
RenderEmojiPlain(emoji.ReplaceAliases) should be called explicitly for
some contents, but not for everything.
Actually in modern days, in most cases it doesn't need such
"ReplaceAliases". So only keep it for issue/PR titles.
If anyone really needs to do ReplaceAliases for some contents, I will
propose a following fix.
Diffstat (limited to 'routers/web')
| -rw-r--r-- | routers/web/repo/issue.go | 3 | ||||
| -rw-r--r-- | routers/web/repo/pull.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 9f08607642..245ed2b2f2 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -32,6 +32,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/emoji" "code.gitea.io/gitea/modules/git" issue_indexer "code.gitea.io/gitea/modules/indexer/issues" issue_template "code.gitea.io/gitea/modules/issue/template" @@ -1435,7 +1436,7 @@ func ViewIssue(ctx *context.Context) { return } - ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, issue.Title) + ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, emoji.ReplaceAliases(issue.Title)) iw := new(issues_model.IssueWatch) if ctx.Doer != nil { diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 14f1eb3102..7ab21f22b9 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -28,6 +28,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/emoji" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/gitrepo" issue_template "code.gitea.io/gitea/modules/issue/template" @@ -335,7 +336,7 @@ func getPullInfo(ctx *context.Context) (issue *issues_model.Issue, ok bool) { ctx.ServerError("LoadRepo", err) return nil, false } - ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, issue.Title) + ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, emoji.ReplaceAliases(issue.Title)) ctx.Data["Issue"] = issue if !issue.IsPull { |