diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-03-07 12:11:03 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-03-07 15:09:43 +0100 |
| commit | f652c28b2105792908dc73a414ff21cc135a906d (patch) | |
| tree | 55d92c815af8322068b132d895ac2c8b94455bb3 /lib/private/TemplateLayout.php | |
| parent | 50a9beb4bbcfc7baf2a832fef2f6fdf601d8219e (diff) | |
| download | nextcloud-server-f652c28b2105792908dc73a414ff21cc135a906d.tar.gz nextcloud-server-f652c28b2105792908dc73a414ff21cc135a906d.zip | |
Use JSCombiner from server container when searching for JS files
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/TemplateLayout.php')
| -rw-r--r-- | lib/private/TemplateLayout.php | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 0f2eb48bef3..c378396c727 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -306,13 +306,7 @@ class TemplateLayout extends \OC_Template { $theme, array( \OC::$SERVERROOT => \OC::$WEBROOT ), array( \OC::$SERVERROOT => \OC::$WEBROOT ), - new JSCombiner( - \OC::$server->getAppDataDir('js'), - \OC::$server->getURLGenerator(), - \OC::$server->getMemCacheFactory()->createDistributed('JS'), - \OC::$server->getSystemConfig(), - \OC::$server->getLogger() - ) + \OC::$server->query(JSCombiner::class) ); $locator->find($scripts); return $locator->getResources(); |