Merge pull request #47099 from nextcloud/backport/47095/stable28

[stable28] fix(theming): make cache buster depend on the app version
nextcloud · Aug 8, 2024 · d90a456 · d90a456
2 parents 22fa192 + a23ab36
commit d90a456
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
@@ -334,12 +334,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);
 	}
 }