diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-01-19 19:59:53 -0600 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-01-19 19:59:53 -0600 |
| commit | 12e3b357d43d3ee51dd63ea15ded5ec8b20b06ff (patch) | |
| tree | 79b8ce23db74a4d80ae171dcfaa2e5ca1195613f | |
| parent | 48a3f2a8a2d6217c9938c3719fb752633de7c082 (diff) | |
| download | nextcloud-server-12e3b357d43d3ee51dd63ea15ded5ec8b20b06ff.tar.gz nextcloud-server-12e3b357d43d3ee51dd63ea15ded5ec8b20b06ff.zip | |
Fix default of mail_smtpmode - fixes #3102
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| -rw-r--r-- | config/config.sample.php | 4 | ||||
| -rw-r--r-- | lib/private/Mail/Mailer.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 534af5a3a31..4f018d189da 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -310,9 +310,9 @@ $CONFIG = array( * For ``qmail`` the binary is /var/qmail/bin/sendmail, and it must be installed * on your Unix system. * - * Defaults to ``sendmail`` + * Defaults to ``php`` */ -'mail_smtpmode' => 'sendmail', +'mail_smtpmode' => 'php', /** * This depends on ``mail_smtpmode``. Specify the IP address of your mail diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index df8fa80f2c2..e704e8e3490 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -200,7 +200,7 @@ class Mailer implements IMailer { * @return \Swift_SendmailTransport */ protected function getSendMailInstance() { - switch ($this->config->getSystemValue('mail_smtpmode', 'sendmail')) { + switch ($this->config->getSystemValue('mail_smtpmode', 'php')) { case 'qmail': $binaryPath = '/var/qmail/bin/sendmail'; break; |