diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-09-14 06:37:21 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-09-14 06:37:21 +0400 |
commit | 8d11a25fa7f41212584a58998c59884a4b9836d4 (patch) | |
tree | 39d6e3892346288619987f32a562f7e102c6f34c /plugins/CoreUpdater | |
parent | 4e910af4d770e19bcc7f953840662ee8a4c08b20 (diff) |
Moving PHP/server settings getter/setter to SettingsServer class
Diffstat (limited to 'plugins/CoreUpdater')
-rw-r--r-- | plugins/CoreUpdater/Controller.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index d34a125487..41a94678c4 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -20,6 +20,7 @@ use Piwik\Filesystem; use Piwik\Http; use Piwik\Piwik; use Piwik\Plugins\LanguagesManager\LanguagesManager; +use Piwik\SettingsServer; use Piwik\Unzip; use Piwik\UpdateCheck; use Piwik\Updater; @@ -70,7 +71,7 @@ class Controller extends \Piwik\Controller Piwik::checkUserIsSuperUser(); $this->newVersion = $this->checkNewVersionIsAvailableOrDie(); - Piwik::setMaxExecutionTime(0); + SettingsServer::setMaxExecutionTime(0); $url = self::getLatestZipUrl($this->newVersion); $steps = array( @@ -251,16 +252,16 @@ class Controller extends \Piwik\Controller Piwik::redirectToModule('CoreHome'); } - Piwik::setMaxExecutionTime(0); + SettingsServer::setMaxExecutionTime(0); - $cli = Common::isPhpCliMode() ? '_cli' : ''; + $cli = SettingsServer::isPhpCliMode() ? '_cli' : ''; $welcomeTemplate = '@CoreUpdater/runUpdaterAndExit_welcome' . $cli; $doneTemplate = '@CoreUpdater/runUpdaterAndExit_done' . $cli; $viewWelcome = new View($welcomeTemplate); $viewDone = new View($doneTemplate); $sqlQueries = $updater->getSqlQueriesToExecute(); - if (Common::isPhpCliMode()) { + if (SettingsServer::isPhpCliMode()) { $this->doWelcomeUpdates($viewWelcome, $componentsWithUpdateFile); echo $viewWelcome->render(); |