diff options
author | Joas Schilling <coding@schilljs.com> | 2016-07-15 10:22:44 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2016-07-15 10:22:44 +0300 |
commit | 06ac822b710acf473a7baad363aa08faacbda5ab (patch) | |
tree | df14339874b67e05f1629de838e7c2d974378cb1 /lib | |
parent | b73e46f4715c84a553171e3f4e99d9d43299998e (diff) |
Use the themed Defaults everywhere
Diffstat (limited to 'lib')
-rw-r--r-- | lib/base.php | 2 | ||||
-rw-r--r-- | lib/private/console/application.php | 2 | ||||
-rw-r--r-- | lib/private/server.php | 2 | ||||
-rw-r--r-- | lib/private/setup.php | 2 | ||||
-rw-r--r-- | lib/private/urlgenerator.php | 2 | ||||
-rw-r--r-- | lib/private/util.php | 2 | ||||
-rw-r--r-- | lib/public/defaults.php | 2 |
7 files changed, 7 insertions, 7 deletions
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(); } /** |