Skip to content

Commit b16e5a4

Browse files
ethantkoeniglafriks
ethantkoenig
authored and
lafriks
committed
Fix over-escaped characters (#2992)
1 parent 460d0d9 commit b16e5a4

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

‎modules/templates/helper.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@ import (
1616
"strings"
1717
"time"
1818

19-
"github.com/microcosm-cc/bluemonday"
20-
"golang.org/x/net/html/charset"
21-
"golang.org/x/text/transform"
22-
"gopkg.in/editorconfig/editorconfig-core-go.v1"
23-
2419
"code.gitea.io/gitea/models"
2520
"code.gitea.io/gitea/modules/base"
2621
"code.gitea.io/gitea/modules/log"
2722
"code.gitea.io/gitea/modules/markup"
2823
"code.gitea.io/gitea/modules/setting"
24+
25+
"golang.org/x/net/html/charset"
26+
"golang.org/x/text/transform"
27+
"gopkg.in/editorconfig/editorconfig-core-go.v1"
2928
)
3029

3130
// NewFuncMap returns functions for injecting to templates
@@ -67,7 +66,6 @@ func NewFuncMap() []template.FuncMap {
6766
"AvatarLink": base.AvatarLink,
6867
"Safe": Safe,
6968
"SafeJS": SafeJS,
70-
"Sanitize": bluemonday.UGCPolicy().Sanitize,
7169
"Str2html": Str2html,
7270
"TimeSince": base.TimeSince,
7371
"RawTimeSince": base.RawTimeSince,

‎templates/repo/issue/list.tmpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<div class="menu">
3636
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_label_no_select"}}</a>
3737
{{range .Labels}}
38-
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}"><span class="octicon {{if eq $.SelectLabels .ID}}octicon-check{{end}}"></span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | Sanitize}}</a>
38+
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}"><span class="octicon {{if eq $.SelectLabels .ID}}octicon-check{{end}}"></span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name}}</a>
3939
{{end}}
4040
</div>
4141
</div>
@@ -49,7 +49,7 @@
4949
<div class="menu">
5050
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_milestone_no_select"}}</a>
5151
{{range .Milestones}}
52-
<a class="{{if eq $.MilestoneID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&assignee={{$.AssigneeID}}">{{.Name | Sanitize}}</a>
52+
<a class="{{if eq $.MilestoneID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&assignee={{$.AssigneeID}}">{{.Name}}</a>
5353
{{end}}
5454
</div>
5555
</div>
@@ -117,7 +117,7 @@
117117
<div class="menu">
118118
{{range .Labels}}
119119
<div class="item issue-action" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels">
120-
<span class="octicon {{if eq $.SelectLabels .ID}}octicon-check{{end}}"></span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | Sanitize}}
120+
<span class="octicon {{if eq $.SelectLabels .ID}}octicon-check{{end}}"></span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name}}
121121
</div>
122122
{{end}}
123123
</div>
@@ -135,7 +135,7 @@
135135
</div>
136136
{{range .Milestones}}
137137
<div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/milestone">
138-
{{.Name | Sanitize}}
138+
{{.Name}}
139139
</div>
140140
{{end}}
141141
</div>
@@ -175,7 +175,7 @@
175175
<a class="ui label" href="{{$.RepoLink}}/src/commit/{{.Ref}}">{{.Ref}}</a>
176176
{{end}}
177177
{{range .Labels}}
178-
<a class="ui label" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{.Name | Sanitize}}</a>
178+
<a class="ui label" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{.Name}}</a>
179179
{{end}}
180180

181181
{{if .NumComments}}
@@ -186,7 +186,7 @@
186186
{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}}
187187
{{if .Milestone}}
188188
<a class="milestone" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.Milestone.ID}}&assignee={{$.AssigneeID}}">
189-
<span class="octicon octicon-milestone"></span> {{.Milestone.Name | Sanitize}}
189+
<span class="octicon octicon-milestone"></span> {{.Milestone.Name}}
190190
</a>
191191
{{end}}
192192
{{if .Assignee}}

‎templates/repo/issue/milestones.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<div class="milestone list">
4444
{{range .Milestones}}
4545
<li class="item">
46-
<i class="octicon octicon-milestone"></i> <a href="{{$.RepoLink}}/issues?state={{$.State}}&milestone={{.ID}}">{{.Name | Sanitize}}</a>
46+
<i class="octicon octicon-milestone"></i> <a href="{{$.RepoLink}}/issues?state={{$.State}}&milestone={{.ID}}">{{.Name}}</a>
4747
<div class="ui right green progress" data-percent="{{.Completeness}}">
4848
<div class="bar" {{if not .Completeness}}style="background-color: transparent"{{end}}>
4949
<div class="progress"></div>

‎templates/repo/issue/view_content/sidebar.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
1919
{{range .Labels}}
2020
<div class="item">
21-
<a class="ui label {{if not .IsChecked}}hide{{end}}" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{.Name | Sanitize}}</a>
21+
<a class="ui label {{if not .IsChecked}}hide{{end}}" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{.Name}}</a>
2222
</div>
2323

2424
{{end}}
@@ -40,7 +40,7 @@
4040
{{.i18n.Tr "repo.issues.new.open_milestone"}}
4141
</div>
4242
{{range .OpenMilestones}}
43-
<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> {{.Name | Sanitize}}</div>
43+
<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> {{.Name}}</div>
4444
{{end}}
4545
{{end}}
4646
{{if .ClosedMilestones}}
@@ -50,7 +50,7 @@
5050
{{.i18n.Tr "repo.issues.new.closed_milestone"}}
5151
</div>
5252
{{range .ClosedMilestones}}
53-
<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> {{.Name | Sanitize}}</a>
53+
<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}"> {{.Name}}</a>
5454
{{end}}
5555
{{end}}
5656
</div>
@@ -59,7 +59,7 @@
5959
<span class="no-select item {{if .Issue.Milestone}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_milestone"}}</span>
6060
<div class="selected">
6161
{{if .Issue.Milestone}}
62-
<a class="item" href="{{.RepoLink}}/issues?milestone={{.Issue.Milestone.ID}}"> {{.Issue.Milestone.Name | Sanitize}}</a>
62+
<a class="item" href="{{.RepoLink}}/issues?milestone={{.Issue.Milestone.ID}}"> {{.Issue.Milestone.Name}}</a>
6363
{{end}}
6464
</div>
6565
</div>

‎templates/repo/wiki/view.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{template "base/head" .}}
22
<div class="repository wiki view">
33
{{template "repo/header" .}}
4-
{{ $title := .title | Sanitize}}
4+
{{ $title := .title}}
55
<div class="ui container">
66
<div class="ui grid">
77
<div class="ui ten wide column">
@@ -21,7 +21,7 @@
2121
</div>
2222
<div class="scrolling menu">
2323
{{range .Pages}}
24-
<div class="item {{if eq $.Title .Name}}selected{{end}}" data-url="{{$.RepoLink}}/wiki/{{.URL}}">{{.Name | Sanitize}}</div>
24+
<div class="item {{if eq $.Title .Name}}selected{{end}}" data-url="{{$.RepoLink}}/wiki/{{.URL}}">{{.Name}}</div>
2525
{{end}}
2626
</div>
2727
</div>

0 commit comments

Comments
 (0)