summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/Controller/AvatarController.php18
1 files changed, 6 insertions, 12 deletions
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index 36b12fbd79c..c01e81a1790 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -111,6 +111,9 @@ class AvatarController extends Controller {
$this->timeFactory = $timeFactory;
}
+
+
+
/**
* @NoAdminRequired
* @NoCSRFRequired
@@ -133,19 +136,10 @@ class AvatarController extends Controller {
$resp = new FileDisplayResponse($avatar,
Http::STATUS_OK,
['Content-Type' => $avatar->getMimeType()]);
- } catch (NotFoundException $e) {
- $user = $this->userManager->get($userId);
- $resp = new JSONResponse([
- 'data' => [
- 'displayname' => $user->getDisplayName(),
- ],
- ]);
} catch (\Exception $e) {
- $resp = new JSONResponse([
- 'data' => [
- 'displayname' => $userId,
- ],
- ]);
+ $resp = new Http\Response();
+ $resp->setStatus(Http::STATUS_NOT_FOUND);
+ return $resp;
}
// Let cache this!