diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-03-01 14:58:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 14:58:26 +0100 |
| commit | 3026d57ccf1872b8f30ebf9ee590223caa3c0095 (patch) | |
| tree | 90bfda130685fb441568343e802cec92d3fd8dee | |
| parent | 3ade269d1bbbfe3c33906609187b243a9c999615 (diff) | |
| parent | 2ebffc05352fe0566f8bb1e1a6b07583992b8f0c (diff) | |
| download | nextcloud-server-3026d57ccf1872b8f30ebf9ee590223caa3c0095.tar.gz nextcloud-server-3026d57ccf1872b8f30ebf9ee590223caa3c0095.zip | |
Merge pull request #31354 from nextcloud/fix/caching-avatar
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 bcd8315fc43..19265ebfc85 100644 --- a/apps/settings/templates/settings/personal/personal.info.php +++ b/apps/settings/templates/settings/personal/personal.info.php @@ -73,6 +73,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 ed8d0c3cdeb..d8c9745c139 100644 --- a/core/Controller/AvatarController.php +++ b/core/Controller/AvatarController.php @@ -139,7 +139,7 @@ class AvatarController extends Controller { } // Cache for 1 day - $response->cacheFor(60 * 60 * 24); + $response->cacheFor(60 * 60 * 24, false, true); return $response; } |