diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-03-10 15:31:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-10 15:31:32 +0100 |
| commit | b7f192f1a24c445f78a170cf83ba717b27b25f27 (patch) | |
| tree | edc1b8ffc5b3d758151d186796095cf24287fcae | |
| parent | da4cd47753b954ed8f6a00a873ab1210bfcf9f24 (diff) | |
| parent | 07ec9900016752ae17ec6a4dca2aa39b40eec4b3 (diff) | |
| download | nextcloud-server-b7f192f1a24c445f78a170cf83ba717b27b25f27.tar.gz nextcloud-server-b7f192f1a24c445f78a170cf83ba717b27b25f27.zip | |
Merge pull request #31411 from nextcloud/backport/31354/stable22
[stable22] Fix caching of the user avatar
| -rw-r--r-- | apps/settings/templates/settings/personal/personal.info.php | 1 | ||||
| -rw-r--r-- | core/Controller/AvatarController.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/settings/templates/settings/personal/personal.info.php b/apps/settings/templates/settings/personal/personal.info.php index c1a5735aa8f..959f59eaf34 100644 --- a/apps/settings/templates/settings/personal/personal.info.php +++ b/apps/settings/templates/settings/personal/personal.info.php @@ -65,6 +65,7 @@ script('settings', [ <div id="cropper" class="hidden"> <div class="inner-container"> + <p style="width: 300px; margin-top: 0.5rem"><?php p($l->t('Please note that it can take up to 24 hours for the avatar to get updated everywhere.')); ?></p> <div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div> <div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile picture')); ?></div> </div> diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php index 3b87bf15b2f..a567baf5867 100644 --- a/core/Controller/AvatarController.php +++ b/core/Controller/AvatarController.php @@ -134,7 +134,7 @@ class AvatarController extends Controller { } // Cache for 1 day - $response->cacheFor(60 * 60 * 24); + $response->cacheFor(60 * 60 * 24, false, true); return $response; } |