From 54e6f5562732e72ac552ecb2e5787e0d3f15c105 Mon Sep 17 00:00:00 2001 From: Pellaeon Lin Date: Thu, 4 May 2017 00:01:07 +0800 Subject: [PATCH] Use new \OCP\Defaults instead of \OC_Defaults, fixes #62 --- appinfo/application.php | 2 +- controller/registercontroller.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/appinfo/application.php b/appinfo/application.php index 5a9d874..3ab1f54 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -92,7 +92,7 @@ class Application extends App { }); $container->registerService('Defaults', function(SimpleContainer $c) { - return new \OC_Defaults; + return new \OCP\Defaults; }); } diff --git a/controller/registercontroller.php b/controller/registercontroller.php index a53da0f..464e8c6 100644 --- a/controller/registercontroller.php +++ b/controller/registercontroller.php @@ -16,6 +16,7 @@ use \OCP\IRequest; use \OCP\AppFramework\Http\TemplateResponse; use \OCP\AppFramework\Http\RedirectResponse; use \OCP\AppFramework\Controller; +use \OCP\Defaults; use \OCP\Util; use \OCA\Registration\Wrapper; use \OCP\IUserManager; @@ -37,14 +38,14 @@ class RegisterController extends Controller { private $usermanager; private $config; private $groupmanager; - /** @var \OC_Defaults */ + /** @var \OCP\Defaults */ private $defaults; private $random; private $usersession; protected $appName; public function __construct($appName, IRequest $request, IMailer $mailer, IL10N $l10n, $urlgenerator, - $pendingreg, IUserManager $usermanager, IConfig $config, IGroupManager $groupmanager, \OC_Defaults $defaults, + $pendingreg, IUserManager $usermanager, IConfig $config, IGroupManager $groupmanager, Defaults $defaults, ISecureRandom $random, IUserSession $us){ $this->mailer = $mailer; $this->l10n = $l10n;