bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-22 18:09:06 +01:00
Code Issues Projects Releases Wiki Activity

LSldap : combineFilters() : fix parameter support when array contain only one filter

Browse source
This commit is contained in:
Benjamin Renard 2014-11-28 16:16:30 +01:00
parent 9aa48000e5
commit 1518888efa
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
public_html/includes/class/class.LSldap.php
View file

@ -452,7 +452,12 @@ class LSldap {
public static function combineFilters($op,$filters,$asStr=false) { public static function combineFilters($op,$filters,$asStr=false) {
if (is_array($filters) && !empty($filters)) { if (is_array($filters) && !empty($filters)) {
if (count($filters)==1) { if (count($filters)==1) {
return $filters[0]; if ($asStr && $filters[0] instanceof Net_LDAP2_Filter) {
return $filters[0]->asString();
}
else {
return $filters[0];
}
} }
$filter=Net_LDAP2_Filter::combine($op,$filters); $filter=Net_LDAP2_Filter::combine($op,$filters);
if (!Net_LDAP2::isError($filter)) { if (!Net_LDAP2::isError($filter)) {