1
1
mirror of https://github.com/go-gitea/gitea synced 2025-08-26 11:28:27 +00:00

Escape more things that are passed through str2html (#12622) (#12850)

Backport #12622

* Escape more things that are passed through str2html

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Bloody editors!

Co-authored-by: mrsdizzie <info@mrsdizzie.com>

* Update routers/user/oauth.go
This commit is contained in:
zeripath
2020-09-15 23:43:10 +01:00
committed by GitHub
parent 408db95dc1
commit 3a02f0896e
7 changed files with 18 additions and 17 deletions

View File

@@ -106,7 +106,7 @@
<span class="text grey">
<a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
{{$link := printf "%s/commit/%s" $.Repository.HTMLURL $.Issue.PullRequest.MergedCommitID}}
{{$.i18n.Tr "repo.issues.pull_merged_at" $link (ShortSha $.Issue.PullRequest.MergedCommitID) $.BaseTarget $createdStr | Str2html}}
{{$.i18n.Tr "repo.issues.pull_merged_at" $link (ShortSha $.Issue.PullRequest.MergedCommitID) ($.BaseTarget|Escape) $createdStr | Str2html}}
</span>
</div>
{{else if eq .Type 3 5 6}}