Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
sympa
sympa
Commits
c319e761
Unverified
Commit
c319e761
authored
Nov 15, 2019
by
IKEDA Soji
Committed by
GitHub
Nov 15, 2019
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/lib/Sympa/DataSource/LDAP2.pm
View file @
c319e761
...
...
@@ -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
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment