From 33622b7acfa037d0218dd7a9d62b4831015768f3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 20 Sep 2012 08:59:22 -0400
Subject: [PATCH] Revised delete branch feature (issue 121)

---
 src/com/gitblit/GitBlitServer.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/gitblit/GitBlitServer.java b/src/com/gitblit/GitBlitServer.java
index 1307bc3..f0dce77 100644
--- a/src/com/gitblit/GitBlitServer.java
+++ b/src/com/gitblit/GitBlitServer.java
@@ -280,11 +280,11 @@
 			if (StringUtils.isEmpty(params.ldapLdifFile) == false) {
 				File ldifFile = new File(params.ldapLdifFile);
 				if (ldifFile != null && ldifFile.exists()) {
-					URI ldapUrl = new URI(settings.getRequiredString(Keys.realm.ldap_server));
+					URI ldapUrl = new URI(settings.getRequiredString(Keys.realm.ldap.server));
 					String firstLine = new Scanner(ldifFile).nextLine();
 					String rootDN = firstLine.substring(4);
-					String bindUserName = settings.getString(Keys.realm.ldap_username, "");
-					String bindPassword = settings.getString(Keys.realm.ldap_password, "");
+					String bindUserName = settings.getString(Keys.realm.ldap.username, "");
+					String bindPassword = settings.getString(Keys.realm.ldap.password, "");
 					
 					// Get the port
 					int port = ldapUrl.getPort();

--
Gitblit v1.9.1