Merge pull request #31354 from nextcloud/fix/caching-avatar

Fix caching of the user avatar

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>

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