From f3ff376a5eb945f15329b66bbb7d69ed3ca2ce3f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 03 Aug 2012 20:39:50 -0400
Subject: [PATCH] Confirmed fix for GO settings manipulation (issue 85)
---
src/com/gitblit/wicket/pages/RepositoryPage.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index 3f57fbf..45822e1 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.java
@@ -153,7 +153,7 @@
protected void setupPage(String repositoryName, String pageName) {
add(new LinkPanel("repositoryName", null, StringUtils.stripDotGit(repositoryName),
SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryName)));
- add(new Label("pageName", pageName));
+ add(new Label("pageName", pageName).setRenderBodyOnly(true));
if (getRepositoryModel().isBare) {
add(new Label("workingCopy").setVisible(false));
} else {
@@ -216,11 +216,11 @@
}
protected void addFullText(String wicketId, String text, boolean substituteRegex) {
- String html;
+ String html = StringUtils.escapeForHtml(text, true);
if (substituteRegex) {
html = GitBlit.self().processCommitMessage(repositoryName, text);
} else {
- html = StringUtils.breakLinesForHtml(text);
+ html = StringUtils.breakLinesForHtml(html);
}
add(new Label(wicketId, html).setEscapeModelStrings(false));
}
@@ -254,7 +254,7 @@
setPersonSearchTooltip(nameLink, name, searchType);
fullPerson.add(nameLink);
- LinkPanel addressLink = new LinkPanel("personAddress", "list", "<" + address + ">",
+ LinkPanel addressLink = new LinkPanel("personAddress", "hidden-phone list", "<" + address + ">",
GitSearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId,
address, searchType));
setPersonSearchTooltip(addressLink, address, searchType);
--
Gitblit v1.9.1