diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-03-03 16:15:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-03 16:15:14 +0100 |
commit | 6ea1aef0315fa2812ad80e0af8456531e19ea642 (patch) | |
tree | 90d0dfb13f3adbede6ed096ab8b2606304548ee8 /core/Controller | |
parent | 57707aaec670cadcbc44b1fd35b2330232d025f1 (diff) | |
parent | 68148f4073948a39e7247c3e9b5e6a4317d25fd0 (diff) | |
download | nextcloud-server-6ea1aef0315fa2812ad80e0af8456531e19ea642.tar.gz nextcloud-server-6ea1aef0315fa2812ad80e0af8456531e19ea642.zip |
Merge pull request #19723 from nextcloud/bug/18603/avatar-response
Always use status 200 for avatar response
Diffstat (limited to 'core/Controller')
-rw-r--r-- | core/Controller/AvatarController.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php index 5ecdc91db24..ac07129a04f 100644 --- a/core/Controller/AvatarController.php +++ b/core/Controller/AvatarController.php @@ -144,8 +144,8 @@ class AvatarController extends Controller { $avatarFile = $avatar->getFile($size); $response = new FileDisplayResponse( $avatarFile, - $avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED, - ['Content-Type' => $avatarFile->getMimeType()] + Http::STATUS_OK, + ['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()] ); } catch (\Exception $e) { return new JSONResponse([], Http::STATUS_NOT_FOUND); |