diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-16 00:10:00 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-16 00:10:00 +0200 |
| commit | ac1239220d4f73e18bca2ecceb7170ce6721b1f6 (patch) | |
| tree | cae0df75c41877637e2f35a5e02477c20c94f7a3 /core | |
| parent | 230029e5090b3deecb941e75bbc34a6bcb98c374 (diff) | |
| parent | a446b43bccc2f366a3e64df25320d8e05cd68acb (diff) | |
| download | nextcloud-server-ac1239220d4f73e18bca2ecceb7170ce6721b1f6.tar.gz nextcloud-server-ac1239220d4f73e18bca2ecceb7170ce6721b1f6.zip | |
Merge pull request #19052 from owncloud/revert-14856-remote_avatars
Revert "Allow Remote avatars"
Diffstat (limited to 'core')
| -rw-r--r-- | core/avatar/avatarcontroller.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php index 0c270bee53e..945e022600a 100644 --- a/core/avatar/avatarcontroller.php +++ b/core/avatar/avatarcontroller.php @@ -90,18 +90,14 @@ class AvatarController extends Controller { } /** + * @NoAdminRequired * @NoCSRFRequired - * @PublicPage * * @param string $userId * @param int $size * @return DataResponse|DataDisplayResponse */ public function getAvatar($userId, $size) { - if (!$this->userManager->userExists($userId)) { - return new DataResponse([], Http::STATUS_NOT_FOUND); - } - if ($size > 2048) { $size = 2048; } elseif ($size <= 0) { |