Make it possible to disable apps via the console, which are not enabled for the current user

2 files changed, 16 insertions, 3 deletions

diff --git a/core/command/app/disable.php b/core/command/app/disable.php
index b5e776d7e03..b3157faf32e 100644
--- a/core/command/app/disable.php
+++ b/core/command/app/disable.php
@@ -23,12 +23,25 @@
 
 namespace OC\Core\Command\App;
 
+use OCP\App\IAppManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Disable extends Command {
+
+	/** @var IAppManager */
+	protected $manager;
+
+	/**
+	 * @param IAppManager $manager
+	 */
+	public function __construct(IAppManager $manager) {
+		parent::__construct();
+		$this->manager = $manager;
+	}
+
 	protected function configure() {
 		$this
 			->setName('app:disable')
@@ -42,9 +55,9 @@ class Disable extends Command {
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$appId = $input->getArgument('app-id');
-		if (\OC_App::isEnabled($appId)) {
+		if ($this->manager->isInstalled($appId)) {
 			try {
-				\OC_App::disable($appId);
+				$this->manager->disableApp($appId);
 				$output->writeln($appId . ' disabled');
 			} catch(\Exception $e) {
 				$output->writeln($e->getMessage());
diff --git a/core/register_command.php b/core/register_command.php
index 42e2d29ecea..d167bec2638 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -44,7 +44,7 @@ $application->add(new \OC\Core\Command\Integrity\SignCore(
 ));
 
 if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
-	$application->add(new OC\Core\Command\App\Disable());
+	$application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
 	$application->add(new OC\Core\Command\App\Enable());
 	$application->add(new OC\Core\Command\App\GetPath());
 	$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));