Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2015-03-17 07:20:07 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2015-03-17 07:20:07 +0300
commit80afbfc934fece8e288e6526c0d53afc94f2677e (patch)
tree7fe3c1a44401f46ab59762f8edaee8d6555b44d0 /plugins/CoreUpdater/CoreUpdater.php
parentf1894a1aee763f840a6d541aec6db9ca2c05337e (diff)
fix error "Cannot use Piwik\Updater as Updater because the name is already in use"
Diffstat (limited to 'plugins/CoreUpdater/CoreUpdater.php')
-rw-r--r--plugins/CoreUpdater/CoreUpdater.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index eb5ce6c622..584a465130 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -15,7 +15,7 @@ use Piwik\Filesystem;
use Piwik\FrontController;
use Piwik\Piwik;
use Piwik\UpdateCheck;
-use Piwik\Updater;
+use Piwik\Updater as PiwikCoreUpdater;
use Piwik\UpdaterErrorException;
use Piwik\Version;
@@ -38,7 +38,7 @@ class CoreUpdater extends \Piwik\Plugin
/**
* @deprecated
*/
- public static function updateComponents(Updater $updater, $componentsWithUpdateFile)
+ public static function updateComponents(PiwikCoreUpdater $updater, $componentsWithUpdateFile)
{
return $updater->updateComponents($componentsWithUpdateFile);
}
@@ -46,7 +46,7 @@ class CoreUpdater extends \Piwik\Plugin
/**
* @deprecated
*/
- public static function getComponentUpdates(Updater $updater)
+ public static function getComponentUpdates(PiwikCoreUpdater $updater)
{
return $updater->getComponentUpdates();
}
@@ -56,7 +56,7 @@ class CoreUpdater extends \Piwik\Plugin
$module = Common::getRequestVar('module', '', 'string');
$action = Common::getRequestVar('action', '', 'string');
- $updater = new Updater();
+ $updater = new PiwikCoreUpdater();
$updates = $updater->getComponentsWithNewVersion(array('core' => Version::VERSION));
if (!empty($updates)) {
Filesystem::deleteAllCacheOnUpdate();