diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2014-05-28 22:42:45 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2014-05-28 22:42:45 +0200 |
| commit | 1af293dc136ffa46a454e7d8745265fd2bde89db (patch) | |
| tree | 52420cfa60ed0b2d8e2a772520f4d2f5557c2204 | |
| parent | ce9d5df6df37e51587dcde638086dfe501892b56 (diff) | |
| parent | d89c5e2351352fa0cebb2e201ccabcbe0a401d7b (diff) | |
| download | nextcloud-server-1af293dc136ffa46a454e7d8745265fd2bde89db.tar.gz nextcloud-server-1af293dc136ffa46a454e7d8745265fd2bde89db.zip | |
Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailer
upgraded phpmailer into v5.2.8 via composer
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | lib/private/mail.php | 2 | ||||
| -rw-r--r-- | tests/lib/util.php | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/3rdparty b/3rdparty -Subproject ef80977061d4bc3a2d8ee0bf23a8287a3222b62 +Subproject 82c5785c5ded047fb10791151aed7086785b046 diff --git a/lib/private/mail.php b/lib/private/mail.php index f9083cc4e64..81bcb3d8deb 100644 --- a/lib/private/mail.php +++ b/lib/private/mail.php @@ -12,8 +12,6 @@ * A class to handle mail sending. */ -require_once 'class.phpmailer.php'; - class OC_Mail { /** diff --git a/tests/lib/util.php b/tests/lib/util.php index 4dc7813d918..0bafb96cabd 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -95,7 +95,7 @@ class Test_Util extends PHPUnit_Framework_TestCase { function testGetDefaultEmailAddress() { $email = \OCP\Util::getDefaultEmailAddress("no-reply"); - $this->assertEquals('no-reply@localhost.localdomain', $email); + $this->assertEquals('no-reply@localhost', $email); } function testGetDefaultEmailAddressFromConfig() { |