mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailer 

upgraded phpmailer into v5.2.8 via composer
This commit is contained in:
Lukas Reschke 2014-05-28 22:42:45 +02:00
parent ce9d5df6df d89c5e2351
commit 1af293dc13
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit ef80977061d4bc3a2d8ee0bf23a8287a3222b628
Subproject commit 82c5785c5ded047fb10791151aed7086785b0468

2
lib/private/mail.php
View File

@ -12,8 +12,6 @@
* A class to handle mail sending.
*/
require_once 'class.phpmailer.php';
class OC_Mail {
/**

2
tests/lib/util.php
View File

@ -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() {