http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72741

Revision: 72741
Author:   laner
Date:     2010-09-10 20:06:35 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
Fixed bad references to $ldapconn; they should have been $this->ldapconn.

Modified Paths:
--------------
    trunk/extensions/LdapAuthentication/LdapAuthentication.php

Modified: trunk/extensions/LdapAuthentication/LdapAuthentication.php
===================================================================
--- trunk/extensions/LdapAuthentication/LdapAuthentication.php  2010-09-10 
19:57:11 UTC (rev 72740)
+++ trunk/extensions/LdapAuthentication/LdapAuthentication.php  2010-09-10 
20:06:35 UTC (rev 72741)
@@ -1487,8 +1487,8 @@
                if ( $dn != "*" ) {
                        $PGfilter = 
"(&(distinguishedName=$value)(objectclass=user))";
                        $this->printDebug( "User Filter: $PGfilter", SENSITIVE 
);
-                       $PGinfo = @ldap_search( $ldapconn, $base, $PGfilter );
-                       $PGentries = @ldap_get_entries( $ldapconn, $PGinfo );
+                       $PGinfo = @ldap_search( $this->ldapconn, $base, 
$PGfilter );
+                       $PGentries = @ldap_get_entries( $this->ldapconn, 
$PGinfo );
                        if ( $PGentries ) {
                                $Usid = $PGentries[0]['objectsid'][0];
                                $PGrid = $PGentries[0]['primarygroupid'][0];
@@ -1510,8 +1510,8 @@
                                }
                                $PGfilter = 
"(&(objectSid=$PGsid_string)(objectclass=$objectclass))";
                                $this->printDebug( "Primary Group Filter: 
$PGfilter", SENSITIVE );
-                               $info = @ldap_search( $ldapconn, $base, 
$PGfilter );
-                               $PGentries = @ldap_get_entries( $ldapconn, 
$info );
+                               $info = @ldap_search( $this->ldapconn, $base, 
$PGfilter );
+                               $PGentries = @ldap_get_entries( 
$this->ldapconn, $info );
                                array_shift( $PGentries );
                                $dnMember = strtolower( $PGentry[0]['dn'] );
                                $groups["dn"][] = $dnMember;



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to