github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-01-24 03:03:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

helpers: Avoid unescape in highlight

Browse source 
Fixes #4219
This commit is contained in:
Bjørn Erik Pedersen 2018-01-23 09:48:04 +01:00
parent 8125b4b03d
commit ebdd8cba3f
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
helpers/content_renderer.go
View file

@ -15,7 +15,6 @@ package helpers
import ( import (
"bytes" "bytes"
"html"
"strings" "strings"
"github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/config"
@ -36,7 +35,7 @@ type HugoHTMLRenderer struct {
func (r *HugoHTMLRenderer) BlockCode(out *bytes.Buffer, text []byte, lang string) { func (r *HugoHTMLRenderer) BlockCode(out *bytes.Buffer, text []byte, lang string) {
if r.Cfg.GetBool("pygmentsCodeFences") && (lang != "" || r.Cfg.GetBool("pygmentsCodeFencesGuessSyntax")) { if r.Cfg.GetBool("pygmentsCodeFences") && (lang != "" || r.Cfg.GetBool("pygmentsCodeFencesGuessSyntax")) {
opts := r.Cfg.GetString("pygmentsOptions") opts := r.Cfg.GetString("pygmentsOptions")
str := strings.Trim(html.UnescapeString(string(text)), "\n\r") str := strings.Trim(string(text), "\n\r")
highlighted, _ := r.cs.Highlight(str, lang, opts) highlighted, _ := r.cs.Highlight(str, lang, opts)
out.WriteString(highlighted) out.WriteString(highlighted)
} else { } else {
@ -100,7 +99,7 @@ type HugoMmarkHTMLRenderer struct {
// Pygments is used if it is setup to handle code fences. // Pygments is used if it is setup to handle code fences.
func (r *HugoMmarkHTMLRenderer) BlockCode(out *bytes.Buffer, text []byte, lang string, caption []byte, subfigure bool, callouts bool) { func (r *HugoMmarkHTMLRenderer) BlockCode(out *bytes.Buffer, text []byte, lang string, caption []byte, subfigure bool, callouts bool) {
if r.Cfg.GetBool("pygmentsCodeFences") && (lang != "" || r.Cfg.GetBool("pygmentsCodeFencesGuessSyntax")) { if r.Cfg.GetBool("pygmentsCodeFences") && (lang != "" || r.Cfg.GetBool("pygmentsCodeFencesGuessSyntax")) {
str := strings.Trim(html.UnescapeString(string(text)), "\n\r") str := strings.Trim(string(text), "\n\r")
highlighted, _ := r.cs.Highlight(str, lang, "") highlighted, _ := r.cs.Highlight(str, lang, "")
out.WriteString(highlighted) out.WriteString(highlighted)
} else { } else {