diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-03-17 11:15:39 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-03-17 11:15:39 +0100 |
| commit | b1c19f74a1d245bd8a4a807e73bbe58860d55314 (patch) | |
| tree | 250b6b85573a01ee5677b1c99d73d0e2d13d32bd /settings/application.php | |
| parent | 65259114391eaeab1f6ceb44e52e2c0a5efa9027 (diff) | |
| parent | 7a70fffa6cd1597e588111cd39054b80adf296c0 (diff) | |
| download | nextcloud-server-b1c19f74a1d245bd8a4a807e73bbe58860d55314.tar.gz nextcloud-server-b1c19f74a1d245bd8a4a807e73bbe58860d55314.zip | |
Merge pull request #12085 from owncloud/add-swift-mailer
Migrate OC_Mail to SwiftMailer
Diffstat (limited to 'settings/application.php')
| -rw-r--r-- | settings/application.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/settings/application.php b/settings/application.php index 6fe23447a72..ce47f155ebe 100644 --- a/settings/application.php +++ b/settings/application.php @@ -47,7 +47,7 @@ class Application extends App { $c->query('Config'), $c->query('UserSession'), $c->query('Defaults'), - $c->query('Mail'), + $c->query('Mailer'), $c->query('DefaultMailAddress') ); }); @@ -89,7 +89,7 @@ class Application extends App { $c->query('L10N'), $c->query('Logger'), $c->query('Defaults'), - $c->query('Mail'), + $c->query('Mailer'), $c->query('DefaultMailAddress'), $c->query('URLGenerator'), $c->query('OCP\\App\\IAppManager'), @@ -151,8 +151,8 @@ class Application extends App { $container->registerService('SubAdminFactory', function(IContainer $c) { return new SubAdminFactory(); }); - $container->registerService('Mail', function(IContainer $c) { - return new \OC_Mail; + $container->registerService('Mailer', function(IContainer $c) { + return $c->query('ServerContainer')->getMailer(); }); $container->registerService('Defaults', function(IContainer $c) { return new \OC_Defaults; |