Branch 'kolab-webadmin-3.0' - lib/Auth

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Wed Nov 28 15:14:54 CET 2012


 lib/Auth/LDAP.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d0fe2c0baff32102717e63ac3175476506410e08
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Nov 28 14:14:13 2012 +0000

    Do not append the string "_base_dn" to a call to _subject_base_dn(), as this function does all of the work

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index 9bbcce0..1f94610 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -678,11 +678,11 @@ class LDAP extends Net_LDAP3 {
             $sql = $db->fetch_assoc($db->query("SELECT `key` FROM {$type}_types WHERE id = ?", $typeid));
 
             // Check if the type has a specific base DN specified.
-            $base_dn = $this->_subject_base_dn($sql['key'] . '_' . $type . '_base_dn');
+            $base_dn = $this->_subject_base_dn($sql['key'] . '_' . $type);
         }
 
         if (empty($base_dn)) {
-            $base_dn = $this->_subject_base_dn($type . '_base_dn');
+            $base_dn = $this->_subject_base_dn($type);
         }
 
         return $base_dn;





More information about the commits mailing list