diff options
| -rw-r--r-- | lib/private/mail/mailer.php | 5 | ||||
| -rw-r--r-- | tests/lib/mail/mailer.php | 2 |
2 files changed, 5 insertions, 2 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(); diff --git a/tests/lib/mail/mailer.php b/tests/lib/mail/mailer.php index 21565f9ffb5..8023cda820e 100644 --- a/tests/lib/mail/mailer.php +++ b/tests/lib/mail/mailer.php @@ -77,7 +77,7 @@ class MailerTest extends TestCase { ->method('getSystemValue') ->will($this->returnValue('sendmail')); - $this->assertInstanceOf('\Swift_SendmailTransport', self::invokePrivate($this->mailer, 'getInstance')); + $this->assertInstanceOf('\Swift_Mailer', self::invokePrivate($this->mailer, 'getInstance')); } public function testCreateMessage() { |