From d2426e1eb5d07664b5c26c4247fae3325282d60d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 25 Apr 2012 16:35:40 -0400
Subject: [PATCH] Merge jcrygier's LDAP injection defense and displayname/email retrieval
---
src/com/gitblit/wicket/panels/BasePanel.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/BasePanel.java b/src/com/gitblit/wicket/panels/BasePanel.java
index 73e1399..3606dd0 100644
--- a/src/com/gitblit/wicket/panels/BasePanel.java
+++ b/src/com/gitblit/wicket/panels/BasePanel.java
@@ -38,7 +38,7 @@
protected TimeZone getTimeZone() {
return GitBlit.getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get()
- .getTimezone() : TimeZone.getDefault();
+ .getTimezone() : GitBlit.getTimezone();
}
protected void setPersonSearchTooltip(Component component, String value, Constants.SearchType searchType) {
--
Gitblit v1.9.1