diff options
| author | James Moger <james.moger@gitblit.com> | 2013-05-15 17:21:03 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-05-15 17:21:03 -0400 |
| commit | bca8c5c52554b6aac65b8e2300675ae8f6af1d6d (patch) | |
| tree | 2d73ed86d17b298fa3f1e52017fd78eb6338528f | |
| parent | 6c5885f4fbc78d7019006ba16e91aea222b5aa74 (diff) | |
| download | gitblit-bca8c5c52554b6aac65b8e2300675ae8f6af1d6d.tar.gz gitblit-bca8c5c52554b6aac65b8e2300675ae8f6af1d6d.zip | |
Fix message escaping when combined with regex substitutions (issue 242)
| -rw-r--r-- | releases.moxie | 1 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/CommitPage.html | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/RepositoryPage.java | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/releases.moxie b/releases.moxie index fa6e8b6f..ea547f56 100644 --- a/releases.moxie +++ b/releases.moxie @@ -26,6 +26,7 @@ r17: { - Fixed extracting Groovy scripts on Express installs (issue 220)
- Ensure Redmine url is properly formatted (issue 223)
- Use standard ServletRequestWrapper instead of custom wrapper (issue 224)
+ - Switch commit message back to a pre and ensure that it is properly escaped when combined with commit message regex substitution (issue 242)
changes:
- Improved error logging for servlet containers which provide a null contextFolder (issue 199)
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);
}
|