Skip to content

The Unified and Autonomous Development Platform

Fix issue #1291 - PullRequest / Commit UI: HTML renders escaped special characters instead of showing the escaped character

Robin Shen9dfb37ed42e7
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
index f7b3e9e22d..939d6b1a9f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/BlobTextDiffPanel.java
@@ -360,10 +360,9 @@ public class BlobTextDiffPanel extends Panel {
StringBuilder builder = new StringBuilder();
appendEquals(builder, index, lastContextSize, contextSize);
- String expanded = StringUtils.replace(builder.toString(), "\"", "\\\"");
- expanded = StringUtils.replace(expanded, "\n", "");
+ String expanded = StringUtils.replace(builder.toString(), "\n", "");
String script = String.format("onedev.server.blobTextDiff.expand('%s', %d, \"%s\");",
- getMarkupId(), index, expanded);
+ getMarkupId(), index, JavaScriptEscape.escapeJavaScript(expanded));
target.appendJavaScript(script);
break;
case "openSelectionPopover":