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 6, 2025
2 parents d6ef471 + e982ab8 commit 44a3b6c
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 @@ -4,6 +4,7 @@

- Fixed a bug where custom fields could cause validation errors when running the `users/create` command.
- Fixed a bug where deleting a volume folder wasn’t fully deleting asset data in descendant folders.
- Fixed a bug where `ancestors`, `children`, `descendants`, and `parent` eager-loading wasn’t working on some environments. ([#16381](https://github.com/craftcms/cms/issues/16381), [#16382](https://github.com/craftcms/cms/issues/16382))
- Fixed a JavaScript error that could occur if there was a problem applying changes to field layout elements. ([#16380](https://github.com/craftcms/cms/issues/16380))
- Fixed a bug where field layout designers were validating field names, handles, and instructions, even if they weren’t overridden within the field instance. ([#16380](https://github.com/craftcms/cms/issues/16380))
- Fixed an error that occurred when upgrading to Craft 5. ([#16383](https://github.com/craftcms/cms/issues/16383))
Expand Down
2 changes: 1 addition & 1 deletion src/base/Element.php
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,7 @@ private static function _mapDescendants(array $sourceElements, bool $children):
foreach ($elementStructureData as $elementStructureDatum) {
foreach ($descendantStructureData as $descendantStructureDatum) {
if (
$descendantStructureDatum['structureId'] === $elementStructureDatum['structureId'] &&
$descendantStructureDatum['structureId'] == $elementStructureDatum['structureId'] &&
$descendantStructureDatum['lft'] > $elementStructureDatum['lft'] &&
$descendantStructureDatum['rgt'] < $elementStructureDatum['rgt'] &&
(!$children || $descendantStructureDatum['level'] == $elementStructureDatum['level'] + 1)
Expand Down

0 comments on commit 44a3b6c

Please sign in to comment.