mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no loner use deprecated class \OC_Config

This commit is contained in:
Thomas Müller 2014-09-22 12:04:48 +02:00
parent e655d32979
commit a348a6f450
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/command/upgrade.php
View File

@ -9,6 +9,7 @@
namespace OC\Core\Command; namespace OC\Core\Command;
use OC\Updater; use OC\Updater;
use OCP\IConfig;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
@ -24,6 +25,18 @@ class Upgrade extends Command {
public $upgradeFailed = false; public $upgradeFailed = false;
/**
* @var IConfig
*/
private $config;
/**
* @param IConfig $config
*/
public function __construct(IConfig $config) {
$this->config = $config;
}
protected function configure() { protected function configure() {
$this $this
->setName('upgrade') ->setName('upgrade')
@ -106,7 +119,7 @@ class Upgrade extends Command {
$this->postUpgradeCheck($input, $output); $this->postUpgradeCheck($input, $output);
return self::ERROR_SUCCESS; return self::ERROR_SUCCESS;
} else if(\OC_Config::getValue('maintenance', false)) { } else if($this->config->getSystemValue('maintenance', false)) {
//Possible scenario: ownCloud core is updated but an app failed //Possible scenario: ownCloud core is updated but an app failed
$output->writeln('<warning>ownCloud is in maintenance mode</warning>'); $output->writeln('<warning>ownCloud is in maintenance mode</warning>');
$output->write('<comment>Maybe an upgrade is already in process. Please check the ' $output->write('<comment>Maybe an upgrade is already in process. Please check the '
@ -128,7 +141,7 @@ class Upgrade extends Command {
* @param OutputInterface $output output interface * @param OutputInterface $output output interface
*/ */
protected function postUpgradeCheck(InputInterface $input, OutputInterface $output) { protected function postUpgradeCheck(InputInterface $input, OutputInterface $output) {
$trustedDomains = \OC_Config::getValue('trusted_domains', array()); $trustedDomains = $this->config->getSystemValue('trusted_domains', array());
if (empty($trustedDomains)) { if (empty($trustedDomains)) {
$output->write( $output->write(
'<warning>The setting "trusted_domains" could not be ' . '<warning>The setting "trusted_domains" could not be ' .

2
core/register_command.php
View File

@ -12,7 +12,7 @@ $repair = new \OC\Repair(\OC\Repair::getRepairSteps());
$application->add(new OC\Core\Command\Status); $application->add(new OC\Core\Command\Status);
$application->add(new OC\Core\Command\Db\GenerateChangeScript()); $application->add(new OC\Core\Command\Db\GenerateChangeScript());
$application->add(new OC\Core\Command\Db\ConvertType(OC_Config::getObject(), new \OC\DB\ConnectionFactory())); $application->add(new OC\Core\Command\Db\ConvertType(OC_Config::getObject(), new \OC\DB\ConnectionFactory()));
$application->add(new OC\Core\Command\Upgrade()); $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig()));
$application->add(new OC\Core\Command\Maintenance\SingleUser()); $application->add(new OC\Core\Command\Maintenance\SingleUser());
$application->add(new OC\Core\Command\Maintenance\Mode(OC_Config::getObject())); $application->add(new OC\Core\Command\Maintenance\Mode(OC_Config::getObject()));
$application->add(new OC\Core\Command\App\Disable()); $application->add(new OC\Core\Command\App\Disable());