[xwiki-notifications] r7731 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/impl/LDAP

[SVN]

Author: tmortagne
Date: 2008-02-14 15:38:39 +0100 (Thu, 14 Feb 2008)
New Revision: 7731

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/impl/LDAP/XWikiLDAPAuthServiceImpl.java
Log:
XWIKI-1079: Fix the way configuration parameters are retrieved (xwiki.cfg was 
retrieved before XWikiPreferences)

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/impl/LDAP/XWikiLDAPAuthServiceImpl.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/impl/LDAP/XWikiLDAPAuthServiceImpl.java
       2008-02-14 14:38:06 UTC (rev 7730)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/impl/LDAP/XWikiLDAPAuthServiceImpl.java
       2008-02-14 14:38:39 UTC (rev 7731)
@@ -124,7 +124,7 @@
         XWikiLDAPConnection connector = new XWikiLDAPConnection();
         XWikiLDAPUtils ldapUtils = new XWikiLDAPUtils(connector);
 
-        
ldapUtils.setUidAttributeName(config.getLDAPParam(XWikiLDAPConfig.PROP_LDAP_UID,
+        
ldapUtils.setUidAttributeName(config.getLDAPParam(XWikiLDAPConfig.PREF_LDAP_UID,
             LDAP_DEFAULT_UID, context));
 
         try {
@@ -196,7 +196,7 @@
             // them
             if (userDN == null) {
                 String uidAttributeName =
-                    config.getLDAPParam(XWikiLDAPConfig.PROP_LDAP_UID, 
LDAP_DEFAULT_UID, context);
+                    config.getLDAPParam(XWikiLDAPConfig.PREF_LDAP_UID, 
LDAP_DEFAULT_UID, context);
 
                 // search for the user in LDAP
                 String query =

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications