forward port of Franks recursive LDAP fix
This commit is contained in:
parent
67511cd89f
commit
eb13ca2df3
2 changed files with 13 additions and 11 deletions
|
|
@ -25,6 +25,7 @@
|
||||||
- fix [ 1397890 ] Can't click directly to page 2+ of a thread
|
- fix [ 1397890 ] Can't click directly to page 2+ of a thread
|
||||||
- fix [ 1328895 ] Page Redirect Asset Help File needs to be changed
|
- fix [ 1328895 ] Page Redirect Asset Help File needs to be changed
|
||||||
- fix [ 1423815 ] snippet v6.8.5
|
- fix [ 1423815 ] snippet v6.8.5
|
||||||
|
- fix [ 1421056 ] LDAP Recursive Property Bug
|
||||||
|
|
||||||
6.8.5
|
6.8.5
|
||||||
- fix [ 1396957 ] Insufficient privileges check on the DataForm
|
- fix [ 1396957 ] Insufficient privileges check on the DataForm
|
||||||
|
|
|
||||||
|
|
@ -269,17 +269,18 @@ sub recurseProperty {
|
||||||
return if($msg->code || $msg->count == 0);
|
return if($msg->code || $msg->count == 0);
|
||||||
#loop through the results
|
#loop through the results
|
||||||
for (my $i = 0; $i < $msg->count; $i++) {
|
for (my $i = 0; $i < $msg->count; $i++) {
|
||||||
my $entry = $msg->entry($i);
|
my $entry = $msg->entry($i);
|
||||||
#push all the values stored in the property on to the array stack
|
#push all the values stored in the property on to the array stack
|
||||||
my $properties = $entry->get_value($property,asref => 1);
|
my $properties = $entry->get_value($property,asref => 1);
|
||||||
push(@{$array},@{$properties});
|
$properties = [] unless ref $properties eq "ARRAY";
|
||||||
#Loop through the recursive keys
|
push(@{$array},@{$properties});
|
||||||
if($property ne $recProperty) {
|
#Loop through the recursive keys
|
||||||
$properties = $entry->get_value($recProperty,asref => 1);
|
if($property ne $recProperty) {
|
||||||
}
|
$properties = $entry->get_value($recProperty,asref => 1);
|
||||||
foreach my $prop (@{$properties}) {
|
}
|
||||||
$self->recurseProperty($prop,$array,$property,$recProperty,$count);
|
foreach my $prop (@{$properties}) {
|
||||||
}
|
$self->recurseProperty($prop,$array,$property,$recProperty,$count);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue