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 /lib/private | |
| 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 'lib/private')
| -rw-r--r-- | lib/private/Console/Application.php | 4 | ||||
| -rw-r--r-- | lib/private/Server.php | 2 | ||||
| -rw-r--r-- | lib/private/Setup.php | 2 | ||||
| -rw-r--r-- | lib/private/URLGenerator.php | 4 | ||||
| -rw-r--r-- | lib/private/legacy/util.php | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/lib/private/Console/Application.php b/lib/private/Console/Application.php index ec91064278e..be561342178 100644 --- a/lib/private/Console/Application.php +++ b/lib/private/Console/Application.php @@ -26,8 +26,8 @@ namespace OC\Console; use OC_App; -use OC_Defaults; use OCP\Console\ConsoleEvent; +use OCP\Defaults; use OCP\IConfig; use OCP\IRequest; use Symfony\Component\Console\Application as SymfonyApplication; @@ -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 c663bc44261..d69e384ad75 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -562,7 +562,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 c78654de957..4a81bb31516 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -426,7 +426,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 9ae99d67bc6..c7b2b222faf 100644 --- a/lib/private/URLGenerator.php +++ b/lib/private/URLGenerator.php @@ -29,7 +29,7 @@ */ namespace OC; -use OC_Defaults; +use OCP\Defaults; use OCP\ICacheFactory; use OCP\IConfig; use OCP\IURLGenerator; @@ -222,7 +222,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/legacy/util.php b/lib/private/legacy/util.php index 2a876eda4d0..63da546ec82 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -631,7 +631,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(); |