LdapConnnection: Don't pass param `$serverCtrls` to `ldap_search` prior php 7.3

refs #4013
This commit is contained in:
Johannes Meyer 2020-01-13 13:17:40 +01:00
parent 16a7cb77ac
commit 7bb9c8e25f
1 changed files with 23 additions and 13 deletions

View File

@ -1294,7 +1294,6 @@ class LdapConnection implements Selectable, Inspectable
throw new LogicException('LDAP scope %s not supported by ldapSearch', $scope); throw new LogicException('LDAP scope %s not supported by ldapSearch', $scope);
} }
$serverctrls = [];
if ($pageSize !== null) { if ($pageSize !== null) {
$serverctrls[] = [ $serverctrls[] = [
'oid' => LDAP_CONTROL_PAGEDRESULTS, 'oid' => LDAP_CONTROL_PAGEDRESULTS,
@ -1306,7 +1305,6 @@ class LdapConnection implements Selectable, Inspectable
'cookie' => '' 'cookie' => ''
] ]
]; ];
}
return @$function( return @$function(
$this->getConnection(), $this->getConnection(),
@ -1319,6 +1317,18 @@ class LdapConnection implements Selectable, Inspectable
$deref, $deref,
$serverctrls $serverctrls
); );
} else {
return @$function(
$this->getConnection(),
$baseDn,
$queryString,
$attributes,
$attrsonly,
$sizelimit,
$timelimit,
$deref
);
}
} }
/** /**