diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-10-30 09:51:16 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-10-30 09:51:16 +0100 |
| commit | f46d531a4f4d97766ee5dcb5ea8345cfc941d197 (patch) | |
| tree | d62d16f6f2c7405708b765fcf48b36a86a152076 /core | |
| parent | 0c1a8c953aba8968301f0871a607d5abcf7b3003 (diff) | |
| download | nextcloud-server-f46d531a4f4d97766ee5dcb5ea8345cfc941d197.tar.gz nextcloud-server-f46d531a4f4d97766ee5dcb5ea8345cfc941d197.zip | |
Replace some OC_Config calls with ILogger methods
Diffstat (limited to 'core')
| -rw-r--r-- | core/ajax/update.php | 7 | ||||
| -rw-r--r-- | core/command/status.php | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php index 54038a479fb..7da9b71b751 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -43,9 +43,10 @@ if (OC::checkUpgrade(false)) { \OC_User::setIncognitoMode(true); $logger = \OC::$server->getLogger(); + $config = \OC::$server->getConfig(); $updater = new \OC\Updater( \OC::$server->getHTTPHelper(), - \OC::$server->getConfig(), + $config, $logger ); $incompatibleApps = []; @@ -96,10 +97,10 @@ if (OC::checkUpgrade(false)) { $updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use (&$disabledThirdPartyApps) { $disabledThirdPartyApps[]= $app; }); - $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource) { + $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) { $eventSource->send('failure', $message); $eventSource->close(); - OC_Config::setValue('maintenance', false); + $config->setSystemValue('maintenance', false); }); $updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) { $eventSource->send('success', (string)$l->t('Set log level to debug - current level: "%s"', [ $logLevelName ])); diff --git a/core/command/status.php b/core/command/status.php index a65e985a9ec..2eb58525d3e 100644 --- a/core/command/status.php +++ b/core/command/status.php @@ -38,7 +38,7 @@ class Status extends Base { protected function execute(InputInterface $input, OutputInterface $output) { $values = array( - 'installed' => (bool) \OC_Config::getValue('installed'), + 'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false), 'version' => implode('.', \OC_Util::getVersion()), 'versionstring' => \OC_Util::getVersionString(), 'edition' => \OC_Util::getEditionString(), |