Merge pull request #107 from craftcms/feature/pt-1835-a-license-witho…

…ut-a-linked-order-results-in-an-error Fixed #100 PHP error when eager loading orders on license query
craftcms · Feb 3, 2025 · 506486c · 506486c
2 parents 3f3e256 + e8fe030
commit 506486c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed a bug where users with “Manage licenses” permission weren’t allowed to edit licenses. ([#105](https://github.com/craftcms/digital-products/issues/105))
+- Fixed a PHP error that could occur when eager loading orders on a license query. ([#100](https://github.com/craftcms/digital-products/issues/100))
 
 ## 3.2.3 - 2023-09-11
 

diff --git a/src/elements/License.php b/src/elements/License.php
@@ -276,6 +276,7 @@ public static function eagerLoadingMap(array $sourceElements, string $handle): a
                 ->select('id as source, orderId as target')
                 ->from('{{%digitalproducts_licenses}}')
                 ->where(['in', 'id', $sourceElementIds])
+                ->andWhere(['not', ['orderId' => null]])
                 ->all();
 
             return [