Use new \OCP\Defaults instead of \OC_Defaults, fixes #62

This commit is contained in:
Pellaeon Lin 2017-05-04 00:01:07 +08:00
parent 52ac51462a
commit 54e6f55627
2 changed files with 4 additions and 3 deletions

View File

@ -92,7 +92,7 @@ class Application extends App {
}); });
$container->registerService('Defaults', function(SimpleContainer $c) { $container->registerService('Defaults', function(SimpleContainer $c) {
return new \OC_Defaults; return new \OCP\Defaults;
}); });
} }

View File

@ -16,6 +16,7 @@ use \OCP\IRequest;
use \OCP\AppFramework\Http\TemplateResponse; use \OCP\AppFramework\Http\TemplateResponse;
use \OCP\AppFramework\Http\RedirectResponse; use \OCP\AppFramework\Http\RedirectResponse;
use \OCP\AppFramework\Controller; use \OCP\AppFramework\Controller;
use \OCP\Defaults;
use \OCP\Util; use \OCP\Util;
use \OCA\Registration\Wrapper; use \OCA\Registration\Wrapper;
use \OCP\IUserManager; use \OCP\IUserManager;
@ -37,14 +38,14 @@ class RegisterController extends Controller {
private $usermanager; private $usermanager;
private $config; private $config;
private $groupmanager; private $groupmanager;
/** @var \OC_Defaults */ /** @var \OCP\Defaults */
private $defaults; private $defaults;
private $random; private $random;
private $usersession; private $usersession;
protected $appName; protected $appName;
public function __construct($appName, IRequest $request, IMailer $mailer, IL10N $l10n, $urlgenerator, 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){ ISecureRandom $random, IUserSession $us){
$this->mailer = $mailer; $this->mailer = $mailer;
$this->l10n = $l10n; $this->l10n = $l10n;