From 9340269d8433277807e98059bfb91daa8bc544b4 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Sun, 31 Oct 2021 09:46:51 +0000
Subject: [PATCH] Stop double encoding blame commit messages (#17498) (#17500)
Backport #17498
The call to html.EscapeString in routers/web/repo/blame.go:renderBlame is extraneous
as the commit message is now rendered by the template. The template will correctly
escape strings - therefore we are currently double escaping.
This PR fixes this.
Fix #17492
Signed-off-by: Andrew Thornton <art27@cantab.net>
---
routers/web/repo/blame.go | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go
index 4ade9e9a93..69574111b2 100644
--- a/routers/web/repo/blame.go
+++ b/routers/web/repo/blame.go
@@ -7,7 +7,6 @@ package repo
import (
"container/list"
"fmt"
- "html"
gotemplate "html/template"
"net/http"
"strings"
@@ -244,7 +243,7 @@ func renderBlame(ctx *context.Context, blameParts []git.BlamePart, commitNames m
br.PreviousSha = previousSha
br.PreviousShaURL = fmt.Sprintf("%s/blame/commit/%s/%s", repoLink, previousSha, ctx.Repo.TreePath)
br.CommitURL = fmt.Sprintf("%s/commit/%s", repoLink, part.Sha)
- br.CommitMessage = html.EscapeString(commit.CommitMessage)
+ br.CommitMessage = commit.CommitMessage
br.CommitSince = commitSince
}