summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/Command/Maintenance/Repair.php11
-rw-r--r--core/register_command.php2
2 files changed, 9 insertions, 4 deletions
diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php
index 0d95b0ea3e2..9401dafd26b 100644
--- a/core/Command/Maintenance/Repair.php
+++ b/core/Command/Maintenance/Repair.php
@@ -27,6 +27,7 @@
namespace OC\Core\Command\Maintenance;
use Exception;
+use OCP\App\IAppManager;
use OCP\IConfig;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\ProgressBar;
@@ -47,15 +48,20 @@ class Repair extends Command {
private $progress;
/** @var OutputInterface */
private $output;
+ /** @var IAppManager */
+ private $appManager;
/**
* @param \OC\Repair $repair
* @param IConfig $config
+ * @param EventDispatcherInterface $dispatcher
+ * @param IAppManager $appManager
*/
- public function __construct(\OC\Repair $repair, IConfig $config, EventDispatcherInterface $dispatcher) {
+ public function __construct(\OC\Repair $repair, IConfig $config, EventDispatcherInterface $dispatcher, IAppManager $appManager) {
$this->repair = $repair;
$this->config = $config;
$this->dispatcher = $dispatcher;
+ $this->appManager = $appManager;
parent::__construct();
}
@@ -78,8 +84,7 @@ class Repair extends Command {
}
}
- $appManager = \OC::$server->getAppManager();
- $apps = $appManager->getInstalledApps();
+ $apps = $this->appManager->getInstalledApps();
foreach ($apps as $app) {
if (!$appManager->isEnabledForUser($app)) {
continue;
diff --git a/core/register_command.php b/core/register_command.php
index 3cba0565993..1b91d2005b9 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -136,7 +136,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$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()));
+ \OC::$server->getEventDispatcher(), \OC::$server->getAppManager()));
$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()));