diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-02-28 12:44:15 +0300 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2020-02-28 14:29:04 +0300 |
| commit | 7aac01d3f9f31df529c2e0c733071db85825788c (patch) | |
| tree | 4c4be0aa7ce4f3b6244b30e3def1dce987853fe1 /core/Controller | |
| parent | 21ebb07d4481dba3ca776e3bb962339809f6bce7 (diff) | |
Also cache avatars when it's not allowed
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'core/Controller')
| -rw-r--r-- | core/Controller/AvatarController.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php index 7ec338467c6..5ecdc91db24 100644 --- a/core/Controller/AvatarController.php +++ b/core/Controller/AvatarController.php @@ -134,13 +134,15 @@ class AvatarController extends Controller { if ($scope !== IAccountManager::VISIBILITY_PUBLIC && $this->userId === null) { // Public avatar access is not allowed - return new JSONResponse([], Http::STATUS_NOT_FOUND); + $response = new JSONResponse([], Http::STATUS_NOT_FOUND); + $response->cacheFor(1800); + return $response; } try { $avatar = $this->avatarManager->getAvatar($userId); $avatarFile = $avatar->getFile($size); - $resp = new FileDisplayResponse( + $response = new FileDisplayResponse( $avatarFile, $avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED, ['Content-Type' => $avatarFile->getMimeType()] @@ -150,8 +152,8 @@ class AvatarController extends Controller { } // Cache for 30 minutes - $resp->cacheFor(1800); - return $resp; + $response->cacheFor(1800); + return $response; } /** |