From c0ed865ab2e5166e71fd6046fc2c426dd5b7c6d4 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 29 Aug 2016 21:14:50 +0200
Subject: [PATCH] UserController does not require Defaults

---
 core/Application.php               |  8 --------
 core/Controller/UserController.php | 12 +++---------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/core/Application.php b/core/Application.php
index 0c69394c97967..9a6d0878feea6 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -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'),
diff --git a/core/Controller/UserController.php b/core/Controller/UserController.php
index 0cede94eb6ec9..fc282e36d9b9a 100644
--- a/core/Controller/UserController.php
+++ b/core/Controller/UserController.php
@@ -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;
 	}
 
 	/**