summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Scherzinger <info@andy-scherzinger.de>2024-08-08 10:54:23 +0200
committerGitHub <noreply@github.com>2024-08-08 10:54:23 +0200
commitd90a456598883ece714e1827b682de9df185a641 (patch)
tree5802eeeb5bdb1a374721a75d90758af09851f0a1
parent22fa192588409d350f83b6c42b18d41890c3283f (diff)
parenta23ab367f03e727e5a14258309c941234f412f2a (diff)
downloadnextcloud-server-d90a456598883ece714e1827b682de9df185a641.tar.gz
nextcloud-server-d90a456598883ece714e1827b682de9df185a641.zip
Merge pull request #47099 from nextcloud/backport/47095/stable28
[stable28] fix(theming): make cache buster depend on the app version
-rw-r--r--apps/theming/lib/Util.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index 71ab0a6dc6c..61930037fb5 100644
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -334,12 +334,14 @@ class Util {
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);
}
}