From bca8c5c52554b6aac65b8e2300675ae8f6af1d6d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 15 May 2013 17:21:03 -0400
Subject: [PATCH] Fix message escaping when combined with regex substitutions (issue 242)
---
src/main/java/com/gitblit/wicket/pages/RepositoryPage.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index 9a806f4..8314617 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -431,9 +431,9 @@
}
protected void addFullText(String wicketId, String text, boolean substituteRegex) {
- String html = StringUtils.escapeForHtml(text, true);
+ String html = StringUtils.escapeForHtml(text, false);
if (substituteRegex) {
- html = GitBlit.self().processCommitMessage(repositoryName, text);
+ html = GitBlit.self().processCommitMessage(repositoryName, html);
} else {
html = StringUtils.breakLinesForHtml(html);
}
--
Gitblit v1.9.1