diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-09-14 07:23:23 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-09-14 07:23:23 +0400 |
commit | e3bd0c0b9e8bd34efd27d31fe310602fcfc3a894 (patch) | |
tree | 9e8873a2410dedb65b3e725bf537d4781047b7b7 /plugins/CoreUpdater | |
parent | 8d11a25fa7f41212584a58998c59884a4b9836d4 (diff) |
Moving piwik settings specific getters to SettingsPiwik class
Adding MetricsFormatter class which knows how to format/display metrics (time, money, size, etc)
Diffstat (limited to 'plugins/CoreUpdater')
-rw-r--r-- | plugins/CoreUpdater/Controller.php | 4 | ||||
-rw-r--r-- | plugins/CoreUpdater/CoreUpdater.php | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index 41a94678c4..1112421591 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -325,7 +325,7 @@ class Controller extends \Piwik\Controller } $this->warningMessages = array_merge($this->warningMessages, array_slice($integrityInfo, 1)); } - Piwik::deleteAllCacheOnUpdate(); + Filesystem::deleteAllCacheOnUpdate(); $view->coreError = $this->coreError; $view->warningMessages = $this->warningMessages; @@ -339,7 +339,7 @@ class Controller extends \Piwik\Controller { $this->loadAndExecuteUpdateFiles($updater, $componentsWithUpdateFile); - Piwik::deleteAllCacheOnUpdate(); + Filesystem::deleteAllCacheOnUpdate(); $view->coreError = $this->coreError; $view->warningMessages = $this->warningMessages; diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index 20f3f5c0ae..cb4f2edd1e 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -11,12 +11,13 @@ namespace Piwik\Plugins\CoreUpdater; use Exception; -use Piwik\Piwik; use Piwik\Common; +use Piwik\Filesystem; use Piwik\FrontController; +use Piwik\Piwik; +use Piwik\UpdateCheck; use Piwik\Updater; use Piwik\Version; -use Piwik\UpdateCheck; /** * @@ -61,7 +62,7 @@ class CoreUpdater extends \Piwik\Plugin $updater->addComponentToCheck('core', Version::VERSION); $updates = $updater->getComponentsWithNewVersion(); if (!empty($updates)) { - Piwik::deleteAllCacheOnUpdate(); + Filesystem::deleteAllCacheOnUpdate(); } if (self::getComponentUpdates($updater) !== null && $module != 'CoreUpdater' |