diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2016-07-18 15:59:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 15:59:47 +0200 |
| commit | ea470f877760c72b1e8b865ba600d5bd483027c0 (patch) | |
| tree | 3b4c4fa327d8e6521c782e6e45f1d73eb95d70ec /settings | |
| parent | 68735c188c0f9777f932f55b1c290039c9d6e433 (diff) | |
| parent | ec6f6969789ca2f455c0d2fd04557337c782176b (diff) | |
| download | nextcloud-server-ea470f877760c72b1e8b865ba600d5bd483027c0.tar.gz nextcloud-server-ea470f877760c72b1e8b865ba600d5bd483027c0.zip | |
Merge pull request #405 from nextcloud/theming-fixes
Theming fixes
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/Application.php | 2 | ||||
| -rw-r--r-- | settings/Controller/MailSettingsController.php | 1 | ||||
| -rw-r--r-- | settings/personal.php | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/settings/Application.php b/settings/Application.php index aedf1e00b2d..1549b273c51 100644 --- a/settings/Application.php +++ b/settings/Application.php @@ -227,7 +227,7 @@ class Application extends App { return $c->query('ServerContainer')->getMailer(); }); $container->registerService('Defaults', function(IContainer $c) { - return new \OC_Defaults; + return $c->query('ServerContainer')->getThemingDefaults(); }); $container->registerService('DefaultMailAddress', function(IContainer $c) { return Util::getDefaultEmailAddress('no-reply'); diff --git a/settings/Controller/MailSettingsController.php b/settings/Controller/MailSettingsController.php index 11f72e7e8ee..cd3c6e2224a 100644 --- a/settings/Controller/MailSettingsController.php +++ b/settings/Controller/MailSettingsController.php @@ -29,7 +29,6 @@ use OCP\IRequest; use OCP\IL10N; use OCP\IConfig; use OCP\Mail\IMailer; -use OCP\Mail\IMessage; /** * @package OC\Settings\Controller diff --git a/settings/personal.php b/settings/personal.php index e7a928f88bf..0519e68beaa 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -37,7 +37,7 @@ OC_Util::checkLoggedIn(); -$defaults = new OC_Defaults(); // initialize themable default strings and urls +$defaults = \OC::$server->getThemingDefaults(); $certificateManager = \OC::$server->getCertificateManager(); $config = \OC::$server->getConfig(); $urlGenerator = \OC::$server->getURLGenerator(); |