fix(query+populate): avoid unnecessarily projecting in subpath when p…

…opulating a path that uses an elemMatch projection Fix #9973
Automattic · Mar 10, 2021 · 55c8d30 · 55c8d30
1 parent 6c429ad
commit 55c8d30
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/helpers/query/selectPopulatedFields.js b/lib/helpers/query/selectPopulatedFields.js
@@ -37,10 +37,10 @@ function isPathInFields(userProvidedFields, path) {
   const len = pieces.length;
   let cur = pieces[0];
   for (let i = 1; i < len; ++i) {
-    if (userProvidedFields[cur] != null) {
+    if (userProvidedFields[cur] != null || userProvidedFields[cur + '.$'] != null) {
       return true;
     }
     cur += '.' + pieces[i];
   }
-  return userProvidedFields[cur] != null;
+  return userProvidedFields[cur] != null || userProvidedFields[cur + '.$'] != null;
 }