Skip to content

Commit

Permalink
UserController does not require Defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
rullzer committed Aug 29, 2016
1 parent 4f93dce commit c0ed865
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
8 changes: 0 additions & 8 deletions core/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,6 @@ public function __construct(array $urlParams=array()){
$c->query('TimeFactory')
);
});
$container->registerService('UserController', function(SimpleContainer $c) {
return new UserController(
$c->query('AppName'),
$c->query('Request'),
$c->query('UserManager'),
$c->query('Defaults')
);
});
$container->registerService('LoginController', function(SimpleContainer $c) {
return new LoginController(
$c->query('AppName'),
Expand Down
12 changes: 3 additions & 9 deletions core/Controller/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,20 @@
use \OCP\AppFramework\Controller;
use \OCP\AppFramework\Http\JSONResponse;
use \OCP\IRequest;
use \OCP\IUserManager;

class UserController extends Controller {
/**
* @var \OCP\IUserManager
* @var IUserManager
*/
protected $userManager;

/**
* @var \OC_Defaults
*/
protected $defaults;

public function __construct($appName,
IRequest $request,
$userManager,
$defaults
IUserManager $userManager
) {
parent::__construct($appName, $request);
$this->userManager = $userManager;
$this->defaults = $defaults;
}

/**
Expand Down

0 comments on commit c0ed865

Please sign in to comment.