summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-10-25 18:42:44 +0200
committerGitHub <noreply@github.com>2016-10-25 18:42:44 +0200
commit08268bca397cbea9c61a5a98b13d381949e21bdd (patch)
tree89f568c06420a2896514b24575793744022011ca /core
parent097a9ec8b0f93c2c5e4c56ea9182db2386bd3918 (diff)
parent817729dc3fc9a8233bfb4049f94c5f2136070ec9 (diff)
downloadnextcloud-server-08268bca397cbea9c61a5a98b13d381949e21bdd.tar.gz
nextcloud-server-08268bca397cbea9c61a5a98b13d381949e21bdd.zip
Merge pull request #1891 from nextcloud/downstream-26430
add upgrade command before repair, handle NeedsUpgradeException better
Diffstat (limited to 'core')
-rw-r--r--core/register_command.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/register_command.php b/core/register_command.php
index 89b0cf31ef4..6f31adafe92 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -123,13 +123,13 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
- $application->add(new OC\Core\Command\Maintenance\Repair(
- new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
- \OC::$server->getEventDispatcher()));
$application->add(new OC\Core\Command\Maintenance\SingleUser(\OC::$server->getConfig()));
$application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
+ $application->add(new OC\Core\Command\Maintenance\Repair(
+ new \OC\Repair(\OC\Repair::getRepairSteps(), \OC::$server->getEventDispatcher()), \OC::$server->getConfig(),
+ \OC::$server->getEventDispatcher()));
$application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));