From 06ac822b710acf473a7baad363aa08faacbda5ab Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 15 Jul 2016 09:22:44 +0200 Subject: [PATCH] Use the themed Defaults everywhere --- apps/dav/lib/connector/sabre/serverfactory.php | 2 +- core/application.php | 4 ++-- core/command/maintenance/install.php | 2 +- lib/base.php | 2 +- lib/private/console/application.php | 2 +- lib/private/server.php | 2 +- lib/private/setup.php | 2 +- lib/private/urlgenerator.php | 2 +- lib/private/util.php | 2 +- lib/public/defaults.php | 2 +- settings/application.php | 2 +- settings/personal.php | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/dav/lib/connector/sabre/serverfactory.php b/apps/dav/lib/connector/sabre/serverfactory.php index 8462f624552..47400caeae7 100644 --- a/apps/dav/lib/connector/sabre/serverfactory.php +++ b/apps/dav/lib/connector/sabre/serverfactory.php @@ -98,7 +98,7 @@ class ServerFactory { $server->setBaseUri($baseUri); // Load plugins - $defaults = new \OC_Defaults(); + $defaults = new \OCP\Defaults(); $server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config)); $server->addPlugin(new \OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin($this->config)); $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName())); diff --git a/core/application.php b/core/application.php index 30376ee4f2e..f0748b06ba5 100644 --- a/core/application.php +++ b/core/application.php @@ -123,8 +123,8 @@ class Application extends App { $container->registerService('UserFolder', function(SimpleContainer $c) { return $c->query('ServerContainer')->getUserFolder(); }); - $container->registerService('Defaults', function() { - return new \OC_Defaults; + $container->registerService('Defaults', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getThemingDefaults(); }); $container->registerService('Mailer', function(SimpleContainer $c) { return $c->query('ServerContainer')->getMailer(); diff --git a/core/command/maintenance/install.php b/core/command/maintenance/install.php index 266b50a3fea..fd04d4db53d 100644 --- a/core/command/maintenance/install.php +++ b/core/command/maintenance/install.php @@ -63,7 +63,7 @@ class Install extends Command { // validate the environment $server = \OC::$server; $setupHelper = new Setup($this->config, $server->getIniWrapper(), - $server->getL10N('lib'), new \OC_Defaults(), $server->getLogger(), + $server->getL10N('lib'), $server->getThemingDefaults(), $server->getLogger(), $server->getSecureRandom()); $sysInfo = $setupHelper->getSystemInfo(true); $errors = $sysInfo['errors']; diff --git a/lib/base.php b/lib/base.php index 2ad453189d0..18765c17353 100644 --- a/lib/base.php +++ b/lib/base.php @@ -911,7 +911,7 @@ class OC { if (!$systemConfig->getValue('installed', false)) { \OC::$server->getSession()->clear(); $setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(), - \OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(), + \OC::$server->getL10N('lib'), \OC::$server->getThemingDefaults(), \OC::$server->getLogger(), \OC::$server->getSecureRandom()); $controller = new OC\Core\Controller\SetupController($setupHelper); $controller->run($_POST); diff --git a/lib/private/console/application.php b/lib/private/console/application.php index d23f41f487e..cea9719da80 100644 --- a/lib/private/console/application.php +++ b/lib/private/console/application.php @@ -51,7 +51,7 @@ class Application { * @param IRequest $request */ public function __construct(IConfig $config, EventDispatcherInterface $dispatcher, IRequest $request) { - $defaults = new OC_Defaults; + $defaults = \OC::$server->getThemingDefaults(); $this->config = $config; $this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString()); $this->dispatcher = $dispatcher; diff --git a/lib/private/server.php b/lib/private/server.php index 0731239e884..407026696db 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -510,7 +510,7 @@ class Server extends ServerContainer implements IServerContainer { return new Mailer( $c->getConfig(), $c->getLogger(), - new \OC_Defaults() + $c->getThemingDefaults() ); }); $this->registerService('OcsClient', function (Server $c) { diff --git a/lib/private/setup.php b/lib/private/setup.php index b74e34309dc..fc9189493e0 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -415,7 +415,7 @@ class Setup { } $setupHelper = new \OC\Setup($config, \OC::$server->getIniWrapper(), - \OC::$server->getL10N('lib'), new \OC_Defaults(), \OC::$server->getLogger(), + \OC::$server->getL10N('lib'), \OC::$server->getThemingDefaults(), \OC::$server->getLogger(), \OC::$server->getSecureRandom()); $htaccessContent = file_get_contents($setupHelper->pathToHtaccess()); diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index 327c0c32dfe..b0e3c3c3129 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -218,7 +218,7 @@ class URLGenerator implements IURLGenerator { * @return string url to the online documentation */ public function linkToDocs($key) { - $theme = new OC_Defaults(); + $theme = \OC::$server->getThemingDefaults(); return $theme->buildDocLinkToKey($key); } } diff --git a/lib/private/util.php b/lib/private/util.php index 74a944e0850..92bafc2d7b9 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -625,7 +625,7 @@ class OC_Util { $webServerRestart = false; $setup = new \OC\Setup($config, \OC::$server->getIniWrapper(), \OC::$server->getL10N('lib'), - new \OC_Defaults(), \OC::$server->getLogger(), \OC::$server->getSecureRandom()); + \OC::$server->getThemingDefaults(), \OC::$server->getLogger(), \OC::$server->getSecureRandom()); $urlGenerator = \OC::$server->getURLGenerator(); diff --git a/lib/public/defaults.php b/lib/public/defaults.php index 58b25d5914a..29ce167a65d 100644 --- a/lib/public/defaults.php +++ b/lib/public/defaults.php @@ -51,7 +51,7 @@ class Defaults { * @since 6.0.0 */ function __construct() { - $this->defaults = new \OC_Defaults(); + $this->defaults = \OC::$server->getThemingDefaults(); } /** diff --git a/settings/application.php b/settings/application.php index 5b84d028abf..0ac42879f28 100644 --- a/settings/application.php +++ b/settings/application.php @@ -214,7 +214,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/personal.php b/settings/personal.php index 244cd7eb581..cc7151943d4 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -36,7 +36,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();