Skip to content

Commit

Permalink
Merge pull request #47095 from nextcloud/fix/theming/cache-buster-on-…
Browse files Browse the repository at this point in the history
…upgrade

fix(theming): make cache buster depend on the app version
  • Loading branch information
st3iny authored Aug 7, 2024
2 parents 80fc2a9 + 087f748 commit 5d577be
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion apps/theming/lib/Util.php
Original file line number Diff line number Diff line change
Expand Up @@ -311,12 +311,14 @@ public function getCacheBuster(): string {
if (!is_null($user)) {
$userId = $user->getUID();
}
$serverVersion = \OC_Util::getVersionString();
$themingAppVersion = $this->appManager->getAppVersion('theming');
$userCacheBuster = '';
if ($userId) {
$userCacheBusterValue = (int)$this->config->getUserValue($userId, 'theming', 'userCacheBuster', '0');
$userCacheBuster = $userId . '_' . $userCacheBusterValue;
}
$systemCacheBuster = $this->config->getAppValue('theming', 'cachebuster', '0');
return substr(sha1($userCacheBuster . $systemCacheBuster), 0, 8);
return substr(sha1($serverVersion . $themingAppVersion . $userCacheBuster . $systemCacheBuster), 0, 8);
}
}

0 comments on commit 5d577be

Please sign in to comment.