diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-04-25 08:47:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-25 08:47:14 +0200 |
| commit | b3a0dec8d54e28aa9f3e91cd93877946f58d696a (patch) | |
| tree | 6c603a06c82d42f9817800a332af1e26c2e4c433 /lib | |
| parent | 3e14f21ae76a591902fddae74cafa958a0b4a0a8 (diff) | |
| parent | d771f6591153ff1ceabe69e0e1f91e99a1873eb0 (diff) | |
| download | nextcloud-server-b3a0dec8d54e28aa9f3e91cd93877946f58d696a.tar.gz nextcloud-server-b3a0dec8d54e28aa9f3e91cd93877946f58d696a.zip | |
Merge pull request #8540 from nextcloud/theming-advanced
Add option for header logo and favicon in theming app
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Server.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index fd32b09033e..3786486c2b2 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -114,6 +114,7 @@ use OC\SystemTag\ManagerFactory as SystemTagManagerFactory; use OC\Tagging\TagMapper; use OC\Template\JSCombiner; use OC\Template\SCSSCacher; +use OCA\Theming\ImageManager; use OCA\Theming\ThemingDefaults; use OCP\App\IAppManager; @@ -943,10 +944,10 @@ class Server extends ServerContainer implements IServerContainer { $c->getConfig(), $c->getL10N('theming'), $c->getURLGenerator(), - $c->getAppDataDir('theming'), $c->getMemCacheFactory(), - new Util($c->getConfig(), $this->getAppManager(), $this->getAppDataDir('theming')), - $this->getAppManager() + new Util($c->getConfig(), $this->getAppManager(), $c->getAppDataDir('theming')), + new ImageManager($c->getConfig(), $c->getAppDataDir('theming'), $c->getURLGenerator()), + $c->getAppManager() ); } return new \OC_Defaults(); |