Also apply for VariantQuery::hasProduct

craftcms · Nov 7, 2023 · a18d57b · a18d57b
1 parent f7d4dcf
commit a18d57b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/elements/db/VariantQuery.php b/src/elements/db/VariantQuery.php
@@ -927,11 +927,11 @@ private function _applyHasProductParam(): void
 
         $productQuery->limit = null;
         $productQuery->select('commerce_products.id');
-        $productIds = $productQuery->column();
 
         // Remove any blank product IDs (if any)
-        $productIds = array_filter($productIds);
-        $this->subQuery->andWhere(['commerce_variants.productId' => $productIds]);
+        $productQuery->andWhere(['not', ['commerce_products.id' => null]]);
+
+        $this->subQuery->andWhere(['commerce_variants.productId' => $productQuery]);
     }
 
     /**