Setup sendmail transport

Replaces #19047 and fixes https://github.com/owncloud/enterprise/issues/854 and #19110
owncloud · Oct 14, 2015 · 5ed1744 · 5ed1744
1 parent 85c8af5
commit 5ed1744
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/private/mail/mailer.php b/lib/private/mail/mailer.php
@@ -157,7 +157,10 @@ protected function getInstance() {
 				$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
@@ -77,7 +77,7 @@ public function testGetInstanceSendmail() {
 			->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() {