summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-02-13 21:40:38 +0100
committerMorris Jobke <hey@morrisjobke.de>2018-02-13 21:40:38 +0100
commitd18d323f214face6d2b6c3dae54a2dd3f086550b (patch)
treecf134cbddc081da565048d39f1299673b1e2f539
parentbcf1668cc89441773316bde04d0affb287433da2 (diff)
downloadnextcloud-server-d18d323f214face6d2b6c3dae54a2dd3f086550b.tar.gz
nextcloud-server-d18d323f214face6d2b6c3dae54a2dd3f086550b.zip
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>
-rw-r--r--lib/private/AppFramework/DependencyInjection/DIContainer.php4
-rw-r--r--settings/Controller/MailSettingsController.php7
2 files changed, 1 insertions, 10 deletions
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 5fe925c2998..44c268bdea6 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -152,10 +152,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $c->query('ServerContainer')->getWebRoot();
});
- $this->registerService('fromMailAddress', function() {
- return Util::getDefaultEmailAddress('no-reply');
- });
-
$this->registerService('OC_Defaults', function ($c) {
return $c->getServer()->getThemingDefaults();
});
diff --git a/settings/Controller/MailSettingsController.php b/settings/Controller/MailSettingsController.php
index 22e2662a216..d1ceb14a63c 100644
--- a/settings/Controller/MailSettingsController.php
+++ b/settings/Controller/MailSettingsController.php
@@ -47,8 +47,6 @@ class MailSettingsController extends Controller {
private $userSession;
/** @var IMailer */
private $mailer;
- /** @var string */
- private $defaultMailAddress;
/**
* @param string $appName
@@ -57,21 +55,18 @@ class MailSettingsController extends Controller {
* @param IConfig $config
* @param IUserSession $userSession
* @param IMailer $mailer
- * @param string $fromMailAddress
*/
public function __construct($appName,
IRequest $request,
IL10N $l10n,
IConfig $config,
IUserSession $userSession,
- IMailer $mailer,
- $fromMailAddress) {
+ IMailer $mailer) {
parent::__construct($appName, $request);
$this->l10n = $l10n;
$this->config = $config;
$this->userSession = $userSession;
$this->mailer = $mailer;
- $this->defaultMailAddress = $fromMailAddress;
}
/**