aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2016-08-29 21:14:50 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2016-08-29 21:14:50 +0200
commitc0ed865ab2e5166e71fd6046fc2c426dd5b7c6d4 (patch)
treea02e20e279f53bbbfd798499f76ac16e54f80091
parent4f93dce2e13df9001140344d3fa310075c348262 (diff)
downloadnextcloud-server-c0ed865ab2e5166e71fd6046fc2c426dd5b7c6d4.tar.gz
nextcloud-server-c0ed865ab2e5166e71fd6046fc2c426dd5b7c6d4.zip
UserController does not require Defaults
-rw-r--r--core/Application.php8
-rw-r--r--core/Controller/UserController.php12
2 files changed, 3 insertions, 17 deletions
diff --git a/core/Application.php b/core/Application.php
index 0c69394c979..9a6d0878fee 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -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'),
diff --git a/core/Controller/UserController.php b/core/Controller/UserController.php
index 0cede94eb6e..fc282e36d9b 100644
--- a/core/Controller/UserController.php
+++ b/core/Controller/UserController.php
@@ -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;
}
/**