Author: Nathan.Vonnahme
Date: 2010-02-09 00:56:13 +0100 (Tue, 09 Feb 2010)
New Revision: 27768
Modified:
plugins/bhLDAPAuthPlugin/branches/1.1/lib/
plugins/bhLDAPAuthPlugin/branches/1.1/lib/adLDAP.php
plugins/bhLDAPAuthPlugin/branches/1.1/lib/bhLDAP.php
Log:
recursive bug fix from trunk
Property changes on: plugins/bhLDAPAuthPlugin/branches/1.1/lib
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: plugins/bhLDAPAuthPlugin/branches/1.1/lib/adLDAP.php
===================================================================
--- plugins/bhLDAPAuthPlugin/branches/1.1/lib/adLDAP.php 2010-02-08
23:54:54 UTC (rev 27767)
+++ plugins/bhLDAPAuthPlugin/branches/1.1/lib/adLDAP.php 2010-02-08
23:56:13 UTC (rev 27768)
@@ -298,10 +298,10 @@
$more_groups=array_unique(array_merge($more_groups,$group_names)); //final
groups to return
}
}
+ }
- }
+ $new_groups=array_diff($more_groups,$ret_groups);
$ret_groups = array_unique(array_merge($ret_groups,$more_groups));
// Add the groups to the main list
- $new_groups=array_diff($more_groups,$ret_groups);
}
return ($ret_groups);
}
Modified: plugins/bhLDAPAuthPlugin/branches/1.1/lib/bhLDAP.php
===================================================================
--- plugins/bhLDAPAuthPlugin/branches/1.1/lib/bhLDAP.php 2010-02-08
23:54:54 UTC (rev 27767)
+++ plugins/bhLDAPAuthPlugin/branches/1.1/lib/bhLDAP.php 2010-02-08
23:56:13 UTC (rev 27768)
@@ -80,6 +80,7 @@
if ($recursive){
self::debug("checking recursive group memberships");
foreach ($groups as $id => $group_name){
+ self::debug("recursing down into $group_name");
$extra_grou...@$ldap->recursive_groups($group_name);
$groups=array_unique(array_merge($groups,$extra_groups));
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
