diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2016-08-26 11:53:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-26 11:53:24 +0200 |
| commit | 044d7c3bb71b24a140bdf6581779a16474b0e490 (patch) | |
| tree | 316762615950daaae3b1fc7adf7f2fb2ec2a29de /lib | |
| parent | ad4cab130eda568cdd1e5344796140d853655740 (diff) | |
| parent | c7c53aefb2cefde1dabcf38534950e7a95cad542 (diff) | |
| download | nextcloud-server-044d7c3bb71b24a140bdf6581779a16474b0e490.tar.gz nextcloud-server-044d7c3bb71b24a140bdf6581779a16474b0e490.zip | |
Merge pull request #1026 from nextcloud/theming-extend-defaults
Theming: Add logo and background to ThemingDefaults
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Server.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index b651285e9a5..dd16b3173a6 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -656,12 +656,13 @@ class Server extends ServerContainer implements IServerContainer { $classExists = false; } - if ($classExists && $this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) { + if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming')) { return new ThemingDefaults( - $this->getConfig(), - $this->getL10N('theming'), - $this->getURLGenerator(), - new \OC_Defaults() + $c->getConfig(), + $c->getL10N('theming'), + $c->getURLGenerator(), + new \OC_Defaults(), + $c->getLazyRootFolder() ); } return new \OC_Defaults(); |