Merge branch '3.x' into 4.x

2026-09-24 15:42:09 +08:00 · 2025-09-24 17:22:48 +01:00
parent 048cde396a 78591c9d16
commit 4eb003939f
1 changed files with 5 additions and 0 deletions
@@ -153,6 +153,11 @@ trait CanExportRecords
            $records = $action instanceof ExportBulkAction ? $action->getIndividuallyAuthorizedSelectedRecords() : null;

            $totalRows = $records ? $records->count() : $query->toBase()->getCountForPagination();
+
+            if ((! $records) && $query->getLimit()) {
+                $totalRows = min($totalRows, $query->getLimit());
+            }
+
            $maxRows = $action->getMaxRows() ?? $totalRows;

            if ($maxRows < $totalRows) {