upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #38304 from nextcloud/backport/38143/stable26

Browse source 
[stable26] Fix generated avatars cache
This commit is contained in:
Kate 2023-05-16 17:08:50 +02:00 committed by GitHub
commit 554d0b17c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/Avatar/AvatarManager.php
View file

@ -160,13 +160,8 @@ class AvatarManager implements IAvatarManager {
public function clearCachedAvatars() {
$users = $this->config->getUsersForUserValue('avatar', 'generated', 'true');
foreach ($users as $userId) {
try {
$folder = $this->appData->getFolder($userId);
$folder->delete();
} catch (NotFoundException $e) {
$this->logger->debug("No cache for the user $userId. Ignoring...");
}
$this->config->setUserValue($userId, 'avatar', 'generated', 'false');
// This also bumps the avatar version leading to cache invalidation in browsers
$this->getAvatar($userId)->remove();
}
}

7
lib/private/Repair/ClearGeneratedAvatarCache.php
View file

@ -42,7 +42,7 @@ class ClearGeneratedAvatarCache implements IRepairStep {
}
public function getName(): string {
return 'Clear every generated avatar on major updates';
return 'Clear every generated avatar';
}
/**
@ -51,8 +51,9 @@ class ClearGeneratedAvatarCache implements IRepairStep {
private function shouldRun(): bool {
$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
// was added to 25.0.0.10
return version_compare($versionFromBeforeUpdate, '25.0.0.10', '<=');
// This job only runs if the server was on a version lower than or equal to 26.0.2 before the upgrade.
// To clear the avatar cache again, bump the version to the currently released version (and change the operator to <= if it's not the master branch) and wait for the next release.
return version_compare($versionFromBeforeUpdate, '26.0.2', '<');
}
public function run(IOutput $output): void {

2
tests/lib/Repair/ClearGeneratedAvatarCacheTest.php
View file

@ -61,7 +61,7 @@ class ClearGeneratedAvatarCacheTest extends \Test\TestCase {
['15.0.0.3', true],
['13.0.5.2', true],
['12.0.0.0', true],
['26.0.0.1', false],
['26.0.0.1', true],
['15.0.0.2', true],
['13.0.0.0', true],
['27.0.0.5', false]