diff options
author | Fabian Becker <halfdan@xnorfz.de> | 2014-01-22 15:04:37 +0400 |
---|---|---|
committer | Fabian Becker <halfdan@xnorfz.de> | 2014-01-22 15:04:37 +0400 |
commit | 74e9976a068208c51de3dfd85a2f6044741769d4 (patch) | |
tree | 72c7faceef7fbe0a7dfb1299e0b4412992e02e13 /core | |
parent | 4d835a1bb0bccb563e067e078f748edf707d3406 (diff) |
Simplify cache buster and use only values that can change.
fixes #4567
Diffstat (limited to 'core')
-rw-r--r-- | core/AssetManager/UIAssetCacheBuster.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/AssetManager/UIAssetCacheBuster.php b/core/AssetManager/UIAssetCacheBuster.php index 181a559c95..8b0f849f6a 100644 --- a/core/AssetManager/UIAssetCacheBuster.php +++ b/core/AssetManager/UIAssetCacheBuster.php @@ -12,7 +12,6 @@ namespace Piwik\AssetManager; use Piwik\Plugin\Manager; -use Piwik\SettingsPiwik; use Piwik\Singleton; use Piwik\Version; @@ -32,8 +31,8 @@ class UIAssetCacheBuster extends Singleton { $masterFile = PIWIK_INCLUDE_PATH . '/.git/refs/heads/master'; $currentGitHash = file_exists($masterFile) ? @file_get_contents($masterFile) : null; - $pluginList = md5(implode(",", !$pluginNames ? Manager::getInstance()->getLoadedPluginsName() : $pluginNames)); - $cacheBuster = md5(SettingsPiwik::getSalt() . $pluginList . PHP_VERSION . Version::VERSION . trim($currentGitHash)); + $pluginList = implode(",", !$pluginNames ? Manager::getInstance()->getLoadedPluginsName() : $pluginNames); + $cacheBuster = md5($pluginList . PHP_VERSION . Version::VERSION . trim($currentGitHash)); return $cacheBuster; } |