Merge branch '3.x' into 4.x

This commit is contained in:
Dan Harrin
2025-09-25 08:19:07 +01:00
@@ -154,8 +154,8 @@ trait CanExportRecords
$totalRows = $records ? $records->count() : $query->toBase()->getCountForPagination();
if ((! $records) && $query->getLimit()) {
$totalRows = min($totalRows, $query->getLimit());
if ((! $records) && $query->getQuery()->limit) {
$totalRows = min($totalRows, $query->getQuery()->limit);
}
$maxRows = $action->getMaxRows() ?? $totalRows;