diff options
| 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() { |