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

Fix default of mail_smtpmode - fixes #3102 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-01-19 19:59:53 -06:00
parent 48a3f2a8a2
commit 12e3b357d4
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.sample.php
View File

@ -310,9 +310,9 @@ $CONFIG = array(
* For ``qmail`` the binary is /var/qmail/bin/sendmail, and it must be installed * For ``qmail`` the binary is /var/qmail/bin/sendmail, and it must be installed
* on your Unix system. * 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 * This depends on ``mail_smtpmode``. Specify the IP address of your mail

2
lib/private/Mail/Mailer.php
View File

@ -200,7 +200,7 @@ class Mailer implements IMailer {
* @return \Swift_SendmailTransport * @return \Swift_SendmailTransport
*/ */
protected function getSendMailInstance() { protected function getSendMailInstance() {
switch ($this->config->getSystemValue('mail_smtpmode', 'sendmail')) { switch ($this->config->getSystemValue('mail_smtpmode', 'php')) {
case 'qmail': case 'qmail':
$binaryPath = '/var/qmail/bin/sendmail'; $binaryPath = '/var/qmail/bin/sendmail';
break; break;