Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Fixed a bug where nested element cards weren’t showing validation errors. ([#18690](https://github.com/craftcms/cms/pull/18690))
- Fixed a bug where read-only Matrix fields in Index mode weren’t respecting the Default Table Columns setting. ([#18684](https://github.com/craftcms/cms/issues/18684))
- Fixed a bug where nested entries could be lost when reverting content from a revision. ([#18691](https://github.com/craftcms/cms/issues/18691))
- Fixed a bug where nested entries weren’t getting loaded when previewing a revision, if queried with `eagerly()`. ([#18693](https://github.com/craftcms/cms/issues/18693))

## 5.9.19 - 2026-04-07

Expand Down
4 changes: 3 additions & 1 deletion src/services/Elements.php
Original file line number Diff line number Diff line change
Expand Up @@ -3492,9 +3492,11 @@ private function _eagerLoadElementsInternal(string $elementType, array $elements
$query->offset = null;
$query->limit = null;

// The mapping criteria should take precedence here
// (see https://github.com/craftcms/cms/pull/18704)
$criteria = array_merge(
$plan->criteria,
$map['criteria'] ?? [],
$plan->criteria
);

// Save the offset & limit params for later
Expand Down
Loading