Skip to content

Commit

Permalink
Merge branch '4.x' of https://github.com/craftcms/cms into 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Jan 29, 2025
2 parents e08b5a8 + a41444a commit 2f5019b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- Fixed a bug where `craft\db\QueryBatcher::getSlice()` wasn’t using the database connection passed to the class constructor. ([#16579](https://github.com/craftcms/cms/issues/16579))
- Fixed an error that could occur when eager-loading nested elements’ owners, if any of the queried elements didn’t have an owner ID. ([#16570](https://github.com/craftcms/cms/issues/16570), [#16572](https://github.com/craftcms/cms/issues/16572), [#16576](https://github.com/craftcms/cms/issues/16576))
- Fixed a bug where collapsed elements within element indexes in structure view weren’t showing their expand/collapse toggles.
- Fixed a bug where Color fields weren’t getting fully instantiated within slideouts, Live Preview, and after copying the field value from another site. ([#16571](https://github.com/craftcms/cms/pull/16571))
Expand Down
2 changes: 1 addition & 1 deletion src/db/QueryBatcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public function getSlice(int $offset, int $limit): iterable
$slice = $query
->offset((is_int($queryOffset) ? $queryOffset : 0) + $offset)
->limit($limit)
->all();
->all($this->db);
} catch (QueryAbortedException) {
$slice = [];
}
Expand Down

0 comments on commit 2f5019b

Please sign in to comment.