upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-27 17:18:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

UserController does not require Defaults

Browse source
This commit is contained in:
Roeland Jago Douma 2016-08-29 21:14:50 +02:00
parent 4f93dce2e1
commit c0ed865ab2
No known key found for this signature in database
GPG key ID: 1E152838F164D13B
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/Application.php
View file

@ -73,14 +73,6 @@ class Application extends App {
$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'),

12
core/Controller/UserController.php
View file

@ -26,26 +26,20 @@ namespace OC\Core\Controller;
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;
}
/**