Backport #16124

craftcms · Nov 18, 2024 · 6b0c951 · 6b0c951
1 parent fbb05a3
commit 6b0c951
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Fixed a JavaScript error that could occur on element edit pages. ([#16055](https://github.com/craftcms/cms/issues/16055))
 - Fixed a Twig deprecation error. ([#16107](https://github.com/craftcms/cms/issues/16107))
+- Fixed a bug where `craft\services\Structures::fillGapsInElements()` wasn’t working properly if the elements weren’t passed in hierarchical order. ([#16085](https://github.com/craftcms/cms/issues/16085))
 
 ## 4.13.0 - 2024-11-12
 

diff --git a/src/services/Structures.php b/src/services/Structures.php
@@ -155,6 +155,10 @@ public function fillGapsInElements(array &$elements): void
         $prevElement = null;
         $patchedElements = [];
 
+        // https://github.com/craftcms/cms/issues/16085
+        // don't assume that elements are in the top to bottom order
+        usort($elements, fn(ElementInterface $a, ElementInterface $b) => $a->lft <=> $b->lft);
+
         foreach ($elements as $i => $element) {
             // Did we just skip any elements?
             if (