diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/avatar/avatarcontroller.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php index dd6e8fdc71d..f63e02b7761 100644 --- a/core/avatar/avatarcontroller.php +++ b/core/avatar/avatarcontroller.php @@ -101,11 +101,13 @@ class AvatarController extends Controller { ['Content-Type' => $image->mimeType()]); $resp->setETag(crc32($image->data())); } else { - $resp = new DataResponse( - ['data' => [ - 'displayname' => $this->userManager->get($userId)->getDisplayName() - ] - ]); + $user = $this->userManager->get($userId); + $userName = $user ? $user->getDisplayName() : ''; + $resp = new DataResponse([ + 'data' => [ + 'displayname' => $userName, + ], + ]); } $resp->addHeader('Pragma', 'public'); |