Update lib/query.js

Co-authored-by: Sean Derrow <sean.derrow@gmail.com>
Automattic · May 9, 2024 · 2c0f63b · 2c0f63b
1 parent a20eaa8
commit 2c0f63b
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lib/query.js b/lib/query.js
@@ -2382,11 +2382,10 @@ Query.prototype.merge = function(source) {
   opts.omit = {};
   if (source.$and) {
     opts.omit['$and'] = true;
-    if (this._conditions && this._conditions.$and) {
-      this._conditions.$and = this._conditions.$and.concat(source.$and);
-    } else {
-      this._conditions.$and = [...source.$and];
+    if (!this._conditions) {  // maybe unnecessary?
+      this._conditions = {};
     }
+    this._conditions.$and = (this._conditions.$and || []).concat(source.$and);
   }
   if (source.$or) {
     opts.omit['$or'] = true;