Fixed #2708

craftcms · Apr 9, 2018 · 38d7b6c · 38d7b6c
1 parent 95f5eb8
commit 38d7b6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -16,6 +16,7 @@
 - Fixed an error that could occur when disabling a site on a Single section. ([#2695](https://github.com/craftcms/cms/issues/2695))
 - Fixed an error that could occur on requests without a content type on the response. ([#2704](https://github.com/craftcms/cms/issues/2704))
 - Fixed a bug where the `includeSubfolders` asset query param wasn’t including results in the parent folder. ([#2706](https://github.com/craftcms/cms/issues/2706))
+- Fixed an error that could occur when querying for users eager-loaded with their photos, if any of the resulting users didn’t have a photo. ([#2708](https://github.com/craftcms/cms/issues/2708))
 
 ## 3.0.1 - 2018-04-04
 

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