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: Fix message escaping when combined with regex substitutions (issue
 242)

---
 src/main/java/com/gitblit/wicket/pages/CommitPage.html     | 2 +-
 src/main/java/com/gitblit/wicket/pages/RepositoryPage.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/gitblit/wicket/pages/CommitPage.html b/src/main/java/com/gitblit/wicket/pages/CommitPage.html
index 79a038c9..d63a3932 100644
--- a/src/main/java/com/gitblit/wicket/pages/CommitPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/CommitPage.html
@@ -49,7 +49,7 @@
 	</div>
 	
 	<!-- full message -->
-	<div class="commit_message" wicket:id="fullMessage">[commit message]</div>
+	<pre class="commit_message" wicket:id="fullMessage">[commit message]</pre>
 
 	<!--  git notes -->
 	<table class="gitnotes">
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index 9a806f45..8314617b 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 @@ public abstract class RepositoryPage extends BasePage {
 	}
 
 	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);
 		}
-- 
cgit v1.2.3