summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/settings/templates/settings/personal/personal.info.php1
-rw-r--r--core/Controller/AvatarController.php2
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 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;
}