aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--routes/repo/issue.go3
-rw-r--r--templates/repo/issue/view_content.tmpl2
2 files changed, 3 insertions, 2 deletions
diff --git a/routes/repo/issue.go b/routes/repo/issue.go
index 41d0df1f..70535b2e 100644
--- a/routes/repo/issue.go
+++ b/routes/repo/issue.go
@@ -23,6 +23,7 @@ import (
"github.com/gogits/gogs/pkg/form"
"github.com/gogits/gogs/pkg/markup"
"github.com/gogits/gogs/pkg/setting"
+ "github.com/gogits/gogs/pkg/template"
"github.com/gogits/gogs/pkg/tool"
)
@@ -657,7 +658,7 @@ func viewIssue(c *context.Context, isPullList bool) {
c.Repo.IsWriter() && c.Repo.GitRepo.IsBranchExist(pull.HeadBranch) &&
!branchProtected
- deleteBranchUrl := c.Repo.RepoLink + "/branches/delete/" + pull.HeadBranch
+ deleteBranchUrl := template.EscapePound(c.Repo.RepoLink + "/branches/delete/" + pull.HeadBranch)
c.Data["DeleteBranchLink"] = fmt.Sprintf("%s?commit=%s&redirect_to=%s", deleteBranchUrl, pull.MergedCommitID, c.Data["Link"])
}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 200710cd..c03b6973 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -165,7 +165,7 @@
{{if .IsPullBranchDeletable}}
<div class="ui divider"></div>
<div>
- <form class="ui form" action="{{EscapePound .DeleteBranchLink}}" method="post">
+ <form class="ui form" action="{{.DeleteBranchLink}}" method="post">
{{.CSRFTokenHTML}}
<button class="ui red button">{{$.i18n.Tr "repo.pulls.delete_branch"}}</button>
</form>