Merge branch '4.4' into 5.1

* 4.4:
  [Ldap] Fix undefined variable $con.
This commit is contained in:
Alexander M. Turek 2020-11-16 18:33:12 +01:00
commit e05dc00d99

View File

@ -151,8 +151,9 @@ class EntryManager implements EntryManagerInterface
$operationsMapped[] = $modification->toArray();
}
if (!@ldap_modify_batch($this->getConnectionResource(), $dn, $operationsMapped)) {
throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": ', $dn).ldap_error($this->getConnectionResource()), ldap_errno($con));
$con = $this->getConnectionResource();
if (!@ldap_modify_batch($con, $dn, $operationsMapped)) {
throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": ', $dn).ldap_error($con), ldap_errno($con));
}
}