fix(populate): handle populating subdoc array virtual with sort

Fix #10552
Automattic · Aug 17, 2021 · 6b92599 · 6b92599
1 parent 283d43f
commit 6b92599
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/helpers/populate/assignRawDocsToIdStructure.js b/lib/helpers/populate/assignRawDocsToIdStructure.js
@@ -69,7 +69,12 @@ function assignRawDocsToIdStructure(rawIds, resultDocs, resultOrder, options, re
     if (recursed) {
       if (doc) {
         if (sorting) {
-          newOrder[resultOrder[sid]] = doc;
+          const _resultOrder = resultOrder[sid];
+          if (Array.isArray(_resultOrder) && Array.isArray(doc) && _resultOrder.length === doc.length) {
+            newOrder.push(doc);
+          } else {
+            newOrder[_resultOrder] = doc;
+          }
         } else {
           newOrder.push(doc);
         }