inject and use user manager to delete command instead of using old static oc_user way

remotes/origin/fix-10825
Arthur Schiwon 10 years ago
parent b9235e2a24
commit ae9c9a46b8
  1. 13
      core/command/user/delete.php
  2. 2
      core/register_command.php

@ -14,6 +14,17 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputArgument;
class Delete extends Command {
/** @var \OC\User\Manager */
protected $userManager;
/**
* @param \OC\User\Manager $userManager
*/
public function __construct(\OC\User\Manager $userManager) {
$this->userManager = $userManager;
parent::__construct();
}
protected function configure() {
$this
->setName('user:delete')
@ -26,7 +37,7 @@ class Delete extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
$wasSuccessful = \OC_User::deleteUser($input->getArgument('uid'));
$wasSuccessful = $this->userManager->get($input->getArgument('uid'))->delete();
if($wasSuccessful === true) {
$output->writeln('The specified user was deleted');
return;

@ -22,6 +22,6 @@ $application->add(new OC\Core\Command\Maintenance\Repair($repair, \OC::$server->
$application->add(new OC\Core\Command\User\Report());
$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\LastSeen());
$application->add(new OC\Core\Command\User\Delete());
$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\L10n\CreateJs());

Loading…
Cancel
Save