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:
authormatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-05-05 15:02:56 +0400
committermatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-05-05 15:02:56 +0400
commit8a4d8b9793446911541d6005a75753f48971a801 (patch)
treebff8ae4d63dbd7428f2e8a3aa432f42e23cc298c
parent73f40f5f11bba8c12f0f6990166bd59fab38bef9 (diff)
parent3dcc65909d5a83033b59617de1fea9d29764e601 (diff)
-rw-r--r--core/Piwik.php1
-rw-r--r--plugins/CoreUpdater/Controller.php4
2 files changed, 2 insertions, 3 deletions
diff --git a/core/Piwik.php b/core/Piwik.php
index 11acaa5567..c89e262347 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -1133,7 +1133,6 @@ class Piwik
+ $parameters
);
Piwik_Url::redirectToUrl($newUrl);
- return false;
}
/**
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index c3111b0bac..b7204d1adb 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -200,13 +200,13 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
$this->runUpdaterAndExit();
}
- public function runUpdaterAndExit()
+ protected function runUpdaterAndExit()
{
$updater = new Piwik_Updater();
$componentsWithUpdateFile = Piwik_CoreUpdater::getComponentUpdates($updater);
if(empty($componentsWithUpdateFile))
{
- return;
+ Piwik::redirectToModule('CoreHome');
}
Piwik::setMaxExecutionTime(0);