upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-27 17:18:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

Merge pull request #31410 from nextcloud/backport/31354/stable23

Browse source 
[stable23] Fix caching of the user avatar
This commit is contained in:
Vincent Petry 2022-03-10 15:31:08 +01:00 committed by GitHub
commit a1117d14c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/settings/templates/settings/personal/personal.info.php
View file

@ -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>

2
core/Controller/AvatarController.php
View file

@ -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;
}