Unverified Commit c319e761 authored by IKEDA Soji's avatar IKEDA Soji Committed by GitHub
Browse files

Merge pull request #792 from depouill/sympa-6.2 by depouill

Patch for a working include_ldap_2level_query (#785)
parents c5320263 e262c7c0
......@@ -68,10 +68,10 @@ sub _load_next {
my %options = @_;
if ($options{turn} eq 'first') {
$self->SUPER::_load_next(%options);
return;
return $self->SUPER::_load_next(%options);
}
my @retrieved;
while (my $value = shift @{$self->{_attr1values} || []}) {
my ($escaped, $suffix, $filter);
......@@ -106,11 +106,13 @@ sub _load_next {
next unless $mesg;
$self->{_ds} = $mesg; # hack __dsh()
$self->SUPER::_load_next(%options);
last if $self->{_retrieved} and @{$self->{_retrieved}};
my @tmp_array = $self->SUPER::_load_next(%options);
@tmp_array = map{@$_} @tmp_array;
push @retrieved, @tmp_array;
}
return;
$self->{_retrieved} = [@retrieved];
return $self->{_retrieved};
}
sub _next {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment