From 85c2e6eb34215e2242e388a8f8b7173a14b96ad3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 25 Jun 2011 08:57:29 -0400
Subject: [PATCH] Big push for first release.
---
src/com/gitblit/WebXmlSettings.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/WebXmlSettings.java b/src/com/gitblit/WebXmlSettings.java
index 0ff2a3e..dff5700 100644
--- a/src/com/gitblit/WebXmlSettings.java
+++ b/src/com/gitblit/WebXmlSettings.java
@@ -20,20 +20,28 @@
import javax.servlet.ServletContext;
+import com.gitblit.utils.StringUtils;
+
public class WebXmlSettings extends IStoredSettings {
private final Properties properties = new Properties();
-
+
public WebXmlSettings(ServletContext context) {
super(WebXmlSettings.class);
Enumeration<?> keys = context.getInitParameterNames();
while (keys.hasMoreElements()) {
String key = keys.nextElement().toString();
String value = context.getInitParameter(key);
- properties.put(key, value);
+ properties.put(key, decodeValue(value));
+ logger.debug(key + "=" + properties.getProperty(key));
}
}
+ private String decodeValue(String value) {
+ // Decode escaped backslashes and HTML entities
+ return StringUtils.decodeFromHtml(value).replace("\\\\", "\\");
+ }
+
@Override
protected Properties read() {
return properties;
--
Gitblit v1.9.1