diff --git a/src/DataModel.php b/src/DataModel.php index d6a4394f0..28708aabd 100644 --- a/src/DataModel.php +++ b/src/DataModel.php @@ -139,7 +139,6 @@ public function filterData( */ if ($paginatorComponent !== null) { $paginator = $paginatorComponent->getPaginator(); - $paginator->setItemCount($this->dataSource->getCount()); $this->dataSource->sort($sorting)->limit( $paginator->getOffset(), @@ -148,7 +147,10 @@ public function filterData( $this->onAfterPaginated($this->dataSource); - return $this->dataSource->getData(); + $data = $this->dataSource->getData(); + $paginator->setItemCount($this->dataSource->getCount()); + + return $data; } return $this->dataSource->sort($sorting)->getData();