diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-02-12 13:53:27 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-03-16 12:47:05 +0100 |
| commit | 13486a5ada62e4355473ca01e07371c162951e84 (patch) | |
| tree | c079e9c53691ca14e5e1898c40a93322d6e727f5 /core | |
| parent | 0d9f149dd93997085b85e2b174f5989a1b996263 (diff) | |
| download | nextcloud-server-13486a5ada62e4355473ca01e07371c162951e84.tar.gz nextcloud-server-13486a5ada62e4355473ca01e07371c162951e84.zip | |
Migrate to SwiftMail
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.
Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014
Conflicts:
3rdparty
lib/private/server.php
lib/public/iservercontainer.php
tests/lib/mail.php
tests/settings/controller/mailsettingscontrollertest.php
Conflicts:
3rdparty
lib/private/mail.php
lib/private/server.php
lib/public/iservercontainer.php
settings/ajax/lostpassword.php
settings/application.php
Diffstat (limited to 'core')
| -rw-r--r-- | core/lostpassword/controller/lostcontroller.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php index c039c578b59..d1a4528d449 100644 --- a/core/lostpassword/controller/lostcontroller.php +++ b/core/lostpassword/controller/lostcontroller.php @@ -201,7 +201,7 @@ class LostController extends Controller { try { // FIXME: should be added to the container and injected in here - \OC_Mail::send( + \OCP\Util::sendMail( $email, $user, $this->l10n->t('%s password reset', array($this->defaults->getName())), |