Merge branch '4.4' into 5.1
* 4.4: also reset id readers Fix LDAP pagination
This commit is contained in:
commit
64089870ce
@ -244,6 +244,7 @@ abstract class DoctrineType extends AbstractType implements ResetInterface
|
|||||||
|
|
||||||
public function reset()
|
public function reset()
|
||||||
{
|
{
|
||||||
|
$this->idReaders = [];
|
||||||
$this->entityLoaders = [];
|
$this->entityLoaders = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -174,7 +174,7 @@ class Query extends AbstractQuery
|
|||||||
private function resetPagination()
|
private function resetPagination()
|
||||||
{
|
{
|
||||||
$con = $this->connection->getResource();
|
$con = $this->connection->getResource();
|
||||||
$this->controlPagedResultResponse($con, 0, '');
|
$this->controlPagedResult($con, 0, '');
|
||||||
$this->serverctrls = [];
|
$this->serverctrls = [];
|
||||||
|
|
||||||
// This is a workaround for a bit of a bug in the above invocation
|
// This is a workaround for a bit of a bug in the above invocation
|
||||||
|
Reference in New Issue
Block a user