mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove fromMailAddress from MailSettingsController 

Was removed in https://github.com/nextcloud/server/pull/4379 (0a54d5a) and https://github.com/nextcloud/server/pull/4380 (bae64e8)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2018-02-13 21:40:38 +01:00
parent bcf1668cc8
commit d18d323f21
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/AppFramework/DependencyInjection/DIContainer.php
View File

@ -152,10 +152,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $c->query('ServerContainer')->getWebRoot(); return $c->query('ServerContainer')->getWebRoot();
}); });
$this->registerService('fromMailAddress', function() {
return Util::getDefaultEmailAddress('no-reply');
});
$this->registerService('OC_Defaults', function ($c) { $this->registerService('OC_Defaults', function ($c) {
return $c->getServer()->getThemingDefaults(); return $c->getServer()->getThemingDefaults();
}); });

7
settings/Controller/MailSettingsController.php
View File

@ -47,8 +47,6 @@ class MailSettingsController extends Controller {
private $userSession; private $userSession;
/** @var IMailer */ /** @var IMailer */
private $mailer; private $mailer;
/** @var string */
private $defaultMailAddress;
/** /**
* @param string $appName * @param string $appName
@ -57,21 +55,18 @@ class MailSettingsController extends Controller {
* @param IConfig $config * @param IConfig $config
* @param IUserSession $userSession * @param IUserSession $userSession
* @param IMailer $mailer * @param IMailer $mailer
* @param string $fromMailAddress
*/ */
public function __construct($appName, public function __construct($appName,
IRequest $request, IRequest $request,
IL10N $l10n, IL10N $l10n,
IConfig $config, IConfig $config,
IUserSession $userSession, IUserSession $userSession,
IMailer $mailer, IMailer $mailer) {
$fromMailAddress) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
$this->l10n = $l10n; $this->l10n = $l10n;
$this->config = $config; $this->config = $config;
$this->userSession = $userSession; $this->userSession = $userSession;
$this->mailer = $mailer; $this->mailer = $mailer;
$this->defaultMailAddress = $fromMailAddress;
} }
/** /**