aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/mail
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-10-08 16:46:42 +0200
committerLukas Reschke <lukas@owncloud.com>2015-10-08 16:48:18 +0200
commit18394205c2149ee944871eb684bd0f8e4dbe262c (patch)
tree2712a50bfeec1477ff9a3d4c0a946b19721be838 /lib/private/mail
parent12277869303d3c0183acc9868ca4d6bd591800fd (diff)
downloadnextcloud-server-18394205c2149ee944871eb684bd0f8e4dbe262c.tar.gz
nextcloud-server-18394205c2149ee944871eb684bd0f8e4dbe262c.zip
Setup sendmail transport
Replaces https://github.com/owncloud/core/pull/19047 and fixes https://github.com/owncloud/enterprise/issues/854 and https://github.com/owncloud/core/issues/19110
Diffstat (limited to 'lib/private/mail')
-rw-r--r--lib/private/mail/mailer.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/mail/mailer.php b/lib/private/mail/mailer.php
index d083b992326..bd93f3e3d58 100644
--- a/lib/private/mail/mailer.php
+++ b/lib/private/mail/mailer.php
@@ -157,7 +157,10 @@ class Mailer implements IMailer {
$this->instance = $this->getSMTPInstance();
break;
case 'sendmail':
- $this->instance = $this->getSendMailInstance();
+ // FIXME: Move into the return statement but requires proper testing
+ // for SMTP and mail as well. Thus not really doable for a
+ // minor release.
+ $this->instance = \Swift_Mailer::newInstance($this->getSendMailInstance());
break;
default:
$this->instance = $this->getMailInstance();