diff options
Diffstat (limited to 'core/Metrics.php')
-rw-r--r-- | core/Metrics.php | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/core/Metrics.php b/core/Metrics.php index 009fa36151..e76e8dd5e9 100644 --- a/core/Metrics.php +++ b/core/Metrics.php @@ -8,8 +8,7 @@ */ namespace Piwik; -use Piwik\Cache\LanguageAwareStaticCache; -use Piwik\Cache\PluginAwareStaticCache; +use Piwik\Cache as PiwikCache; use Piwik\Metrics\Formatter; require_once PIWIK_INCLUDE_PATH . "/core/Piwik.php"; @@ -250,10 +249,11 @@ class Metrics public static function getDefaultMetricTranslations() { - $cache = new PluginAwareStaticCache('DefaultMetricTranslations'); + $cacheId = CacheId::pluginAware('DefaultMetricTranslations'); + $cache = PiwikCache::getTransientCache(); - if ($cache->has()) { - return $cache->get(); + if ($cache->contains($cacheId)) { + return $cache->fetch($cacheId); } $translations = array( @@ -302,17 +302,18 @@ class Metrics $translations = array_map(array('\\Piwik\\Piwik','translate'), $translations); - $cache->set($translations); + $cache->save($cacheId, $translations); return $translations; } public static function getDefaultMetrics() { - $cache = new LanguageAwareStaticCache('DefaultMetrics'); + $cacheId = CacheId::languageAware('DefaultMetrics'); + $cache = PiwikCache::getTransientCache(); - if ($cache->has()) { - return $cache->get(); + if ($cache->contains($cacheId)) { + return $cache->fetch($cacheId); } $translations = array( @@ -323,17 +324,18 @@ class Metrics ); $translations = array_map(array('\\Piwik\\Piwik','translate'), $translations); - $cache->set($translations); + $cache->save($cacheId, $translations); return $translations; } public static function getDefaultProcessedMetrics() { - $cache = new LanguageAwareStaticCache('DefaultProcessedMetrics'); + $cacheId = CacheId::languageAware('DefaultProcessedMetrics'); + $cache = PiwikCache::getTransientCache(); - if ($cache->has()) { - return $cache->get(); + if ($cache->contains($cacheId)) { + return $cache->fetch($cacheId); } $translations = array( @@ -345,7 +347,7 @@ class Metrics ); $translations = array_map(array('\\Piwik\\Piwik','translate'), $translations); - $cache->set($translations); + $cache->save($cacheId, $translations); return $translations; } @@ -383,10 +385,11 @@ class Metrics public static function getDefaultMetricsDocumentation() { - $cache = new PluginAwareStaticCache('DefaultMetricsDocumentation'); + $cacheId = CacheId::pluginAware('DefaultMetricsDocumentation'); + $cache = PiwikCache::getTransientCache(); - if ($cache->has()) { - return $cache->get(); + if ($cache->contains($cacheId)) { + return $cache->fetch($cacheId); } $translations = array( @@ -412,7 +415,7 @@ class Metrics $translations = array_map(array('\\Piwik\\Piwik','translate'), $translations); - $cache->set($translations); + $cache->save($cacheId, $translations); return $translations; } |