summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2018-02-26 13:54:00 +0100
committerJulius Härtl <jus@bitgrid.net>2018-04-19 20:14:38 +0200
commit272b392cacdf34d2166105c91b0a06de3e51ed06 (patch)
tree6df721b89919f811ff60b225622a23211ef11aff /lib
parent0bae516c66efe9004d0a8ff504e0deb0069fc9d9 (diff)
downloadnextcloud-server-272b392cacdf34d2166105c91b0a06de3e51ed06.tar.gz
nextcloud-server-272b392cacdf34d2166105c91b0a06de3e51ed06.zip
Move to more generic image handling and add extra images
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Server.php7
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();