Merge branch '4.13'

Automattic · Nov 22, 2017 · 48aeccc · 48aeccc
2 parents 82c615c + ad69054
commit 48aeccc
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/model.js b/lib/model.js
@@ -3598,7 +3598,15 @@ function getModelsMapForPopulate(model, docs, options) {
           if (typeof ref === 'function') {
             ref = ref.call(doc, doc);
           }
-          modelNames = [ref];
+
+          // When referencing nested arrays, the ref should be an Array
+          // of modelNames.
+          if (Array.isArray(ref)) {
+            modelNames = ref;
+          } else {
+            modelNames = [ref];
+          }
+
           isVirtual = true;
         } else {
           // We may have a discriminator, in which case we don't want to