diff options
| author | Carsten Wiedmann <carsten_sttgt@gmx.de> | 2018-11-12 23:26:35 +0100 |
|---|---|---|
| committer | Daniel Kesselberg <mail@danielkesselberg.de> | 2018-11-29 16:02:35 +0100 |
| commit | 446d96f3eb405302b75a3f0de094019dc25e5b44 (patch) | |
| tree | d9316d6efc759b9cb4e0da4d83307c732cff3e19 /lib/private/Mail/Mailer.php | |
| parent | 3da7364c364445997727133d04b4a053b90321f8 (diff) | |
| download | nextcloud-server-446d96f3eb405302b75a3f0de094019dc25e5b44.tar.gz nextcloud-server-446d96f3eb405302b75a3f0de094019dc25e5b44.zip | |
Apply patch from @cwiedmann but drop -oi option for pipe
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'lib/private/Mail/Mailer.php')
| -rw-r--r-- | lib/private/Mail/Mailer.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index df23b669365..7a8b4ad2599 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -282,6 +282,15 @@ class Mailer implements IMailer { break; } - return new \Swift_SendmailTransport($binaryPath . ' -bs'); + switch ($this->config->getSystemValue('mail_sendmailmode', 'smtp')) { + case 'pipe': + $binaryParam = ' -t'; + break; + default: + $binaryParam = ' -bs'; + break; + } + + return new \Swift_SendmailTransport($binaryPath . $binaryParam); } } |