]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix(theming): make cache buster depend on the app version 47099/head
authorRichard Steinmetz <richard@steinmetz.cloud>
Wed, 7 Aug 2024 07:05:12 +0000 (09:05 +0200)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Wed, 7 Aug 2024 08:27:44 +0000 (08:27 +0000)
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
apps/theming/lib/Util.php

index 71ab0a6dc6cd14421f326efbaafc15c4f76c017c..61930037fb59fac2cb77291ce64c7ce32700287b 100644 (file)
@@ -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);
        }
 }