From 2229ddc66b34b06c8ce24d299a079ebd74d88cc6 Mon Sep 17 00:00:00 2001 From: Pellaeon Lin Date: Mon, 6 Oct 2014 16:00:03 +0800 Subject: [PATCH] Should use IUserManager instead of newing a Manager --- appinfo/application.php | 2 +- controller/registercontroller.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/appinfo/application.php b/appinfo/application.php index af66131..aea493c 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -50,7 +50,7 @@ class Application extends App { }); $container->registerService('UserManager', function($c) { - return new \OC\User\Manager(); + return $c->query('ServerContainer')->getUserManager(); }); $container->registerService('Mail', function($c) { diff --git a/controller/registercontroller.php b/controller/registercontroller.php index 84aea47..d6114f8 100644 --- a/controller/registercontroller.php +++ b/controller/registercontroller.php @@ -17,6 +17,7 @@ use \OCP\AppFramework\Http\TemplateResponse; use \OCP\AppFramework\Controller; use \OCP\Util; use \OCA\Registration\Wrapper; +use \OCP\IUserManager; class RegisterController extends Controller { @@ -26,7 +27,7 @@ class RegisterController extends Controller { private $pendingreg; public function __construct($appName, IRequest $request, Wrapper\Mail $mail, $l10n, $urlgenerator, - $pendingreg, $usermanager){ + $pendingreg, IUserManager $usermanager){ $this->mail = $mail; $this->l10n = $l10n; $this->urlgenerator = $urlgenerator;