From c100da33bbba70264016103f93a3e4cb72544345 Mon Sep 17 00:00:00 2001 From: Volkan Gezer Date: Tue, 27 May 2014 23:16:49 +0200 Subject: [PATCH 1/3] upgraded phpmailer into v5.2.8 via composer --- 3rdparty | 2 +- lib/private/mail.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/3rdparty b/3rdparty index ef80977061..cb0e42027d 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit ef80977061d4bc3a2d8ee0bf23a8287a3222b628 +Subproject commit cb0e42027def10363ac37a8e02132ffbb6e38ae3 diff --git a/lib/private/mail.php b/lib/private/mail.php index f9083cc4e6..81bcb3d8de 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 { /** From ed8e0f0a928a4fd77ccf30e133c7de893a380e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 28 May 2014 13:47:27 +0200 Subject: [PATCH 2/3] updating unit test expectations --- tests/lib/util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/util.php b/tests/lib/util.php index 4dc7813d91..0bafb96cab 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() { From d89c5e2351352fa0cebb2e201ccabcbe0a401d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 28 May 2014 15:16:14 +0200 Subject: [PATCH 3/3] Update 3rdparty submodule after merge --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index cb0e42027d..82c5785c5d 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit cb0e42027def10363ac37a8e02132ffbb6e38ae3 +Subproject commit 82c5785c5ded047fb10791151aed7086785b0468